diff options
author | Ville Syrjala <syrjala@sci.fi> | 2006-12-08 05:40:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:29:07 -0500 |
commit | 5850e0cf9a2345498fe2545c37118ef9405044eb (patch) | |
tree | c60cd5a9f71cf5f50defdfb5f820649b975d05d2 /drivers/video/aty/atyfb_base.c | |
parent | 044aaa32e789492e638a229b5f1930bfb8bc75a1 (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/atyfb_base.c')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 8 |
1 files changed, 4 insertions, 4 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 |
3184 | static void aty_init_lcd(struct atyfb_par *par, u32 bios_base) | 3184 | static 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 | ||
3647 | static int __devinit atyfb_atari_probe(void) | 3647 | static 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 |
3797 | static int __devinit atyfb_setup(char *options) | 3797 | static 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 | ||
3869 | static int __devinit atyfb_init(void) | 3869 | static 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 |