diff options
| author |   Ville Syrjala <syrjala@sci.fi> | 2006-12-08 02:40:42 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:29:07 -0800 |
| commit | 5850e0cf9a2345498fe2545c37118ef9405044eb (patch) | |
| tree | c60cd5a9f71cf5f50defdfb5f820649b975d05d2 /drivers/video | |
| parent | [PATCH] atyfb: Remove pointless aty_init() argument (diff) | |
| download | linux-dev-5850e0cf9a2345498fe2545c37118ef9405044eb.tar.xz linux-dev-5850e0cf9a2345498fe2545c37118ef9405044eb.zip | |
[PATCH] atyfb: Fix __init and __devinit annotations
Fix some __init and __devinit annotations.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/aty/atyfb_base.c | 8 | ||||
| -rw-r--r-- | drivers/video/aty/mach64_ct.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 1b3d3a27307c..7636f10eb885 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c @@ -3181,7 +3181,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev, #ifdef __i386__ #ifdef CONFIG_FB_ATY_GENERIC_LCD -static void aty_init_lcd(struct atyfb_par *par, u32 bios_base) +static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base) { u32 driv_inf_tab, sig; u16 lcd_ofs; @@ -3644,7 +3644,7 @@ err_release_mem: #ifdef CONFIG_ATARI -static int __devinit atyfb_atari_probe(void) +static int __init atyfb_atari_probe(void) { struct atyfb_par *par; struct fb_info *info; @@ -3794,7 +3794,7 @@ static struct pci_driver atyfb_driver = { #endif /* CONFIG_PCI */ #ifndef MODULE -static int __devinit atyfb_setup(char *options) +static int __init atyfb_setup(char *options) { char *this_opt; @@ -3866,7 +3866,7 @@ static int __devinit atyfb_setup(char *options) } #endif /* MODULE */ -static int __devinit atyfb_init(void) +static int __init atyfb_init(void) { int err1 = 1, err2 = 1; #ifndef MODULE diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c index 5080816be653..10232cc2dc76 100644 --- a/drivers/video/aty/mach64_ct.c +++ b/drivers/video/aty/mach64_ct.c @@ -370,8 +370,8 @@ void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll) #endif } -static void __init aty_get_pll_ct(const struct fb_info *info, - union aty_pll *pll) +static void __devinit aty_get_pll_ct(const struct fb_info *info, + union aty_pll *pll) { struct atyfb_par *par = (struct atyfb_par *) info->par; u8 tmp, clock; @@ -394,8 +394,8 @@ static void __init aty_get_pll_ct(const struct fb_info *info, } } -static int __init aty_init_pll_ct(const struct fb_info *info, - union aty_pll *pll) +static int __devinit aty_init_pll_ct(const struct fb_info *info, + union aty_pll *pll) { struct atyfb_par *par = (struct atyfb_par *) info->par; u8 mpost_div, xpost_div, sclk_post_div_real, sclk_fb_div, spll_cntl2; |