aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/aty
diff options
context:
space:
mode:
authorVille Syrjala <syrjala@sci.fi>2006-12-08 05:40:42 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:29:07 -0500
commit5850e0cf9a2345498fe2545c37118ef9405044eb (patch)
treec60cd5a9f71cf5f50defdfb5f820649b975d05d2 /drivers/video/aty
parent044aaa32e789492e638a229b5f1930bfb8bc75a1 (diff)
[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/aty')
-rw-r--r--drivers/video/aty/atyfb_base.c8
-rw-r--r--drivers/video/aty/mach64_ct.c8
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,
3181 3181
3182#ifdef __i386__ 3182#ifdef __i386__
3183#ifdef CONFIG_FB_ATY_GENERIC_LCD 3183#ifdef CONFIG_FB_ATY_GENERIC_LCD
3184static void aty_init_lcd(struct atyfb_par *par, u32 bios_base) 3184static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
3185{ 3185{
3186 u32 driv_inf_tab, sig; 3186 u32 driv_inf_tab, sig;
3187 u16 lcd_ofs; 3187 u16 lcd_ofs;
@@ -3644,7 +3644,7 @@ err_release_mem:
3644 3644
3645#ifdef CONFIG_ATARI 3645#ifdef CONFIG_ATARI
3646 3646
3647static int __devinit atyfb_atari_probe(void) 3647static int __init atyfb_atari_probe(void)
3648{ 3648{
3649 struct atyfb_par *par; 3649 struct atyfb_par *par;
3650 struct fb_info *info; 3650 struct fb_info *info;
@@ -3794,7 +3794,7 @@ static struct pci_driver atyfb_driver = {
3794#endif /* CONFIG_PCI */ 3794#endif /* CONFIG_PCI */
3795 3795
3796#ifndef MODULE 3796#ifndef MODULE
3797static int __devinit atyfb_setup(char *options) 3797static int __init atyfb_setup(char *options)
3798{ 3798{
3799 char *this_opt; 3799 char *this_opt;
3800 3800
@@ -3866,7 +3866,7 @@ static int __devinit atyfb_setup(char *options)
3866} 3866}
3867#endif /* MODULE */ 3867#endif /* MODULE */
3868 3868
3869static int __devinit atyfb_init(void) 3869static int __init atyfb_init(void)
3870{ 3870{
3871 int err1 = 1, err2 = 1; 3871 int err1 = 1, err2 = 1;
3872#ifndef MODULE 3872#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)
370#endif 370#endif
371} 371}
372 372
373static void __init aty_get_pll_ct(const struct fb_info *info, 373static void __devinit aty_get_pll_ct(const struct fb_info *info,
374 union aty_pll *pll) 374 union aty_pll *pll)
375{ 375{
376 struct atyfb_par *par = (struct atyfb_par *) info->par; 376 struct atyfb_par *par = (struct atyfb_par *) info->par;
377 u8 tmp, clock; 377 u8 tmp, clock;
@@ -394,8 +394,8 @@ static void __init aty_get_pll_ct(const struct fb_info *info,
394 } 394 }
395} 395}
396 396
397static int __init aty_init_pll_ct(const struct fb_info *info, 397static int __devinit aty_init_pll_ct(const struct fb_info *info,
398 union aty_pll *pll) 398 union aty_pll *pll)
399{ 399{
400 struct atyfb_par *par = (struct atyfb_par *) info->par; 400 struct atyfb_par *par = (struct atyfb_par *) info->par;
401 u8 mpost_div, xpost_div, sclk_post_div_real, sclk_fb_div, spll_cntl2; 401 u8 mpost_div, xpost_div, sclk_post_div_real, sclk_fb_div, spll_cntl2;