Skip to content

Commit

Permalink
[PATCH] atyfb: Fix __init and __devinit annotations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ville Syrjala authored and Linus Torvalds committed Dec 8, 2006
1 parent 044aaa3 commit 5850e0c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions drivers/video/aty/atyfb_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -3644,7 +3644,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi

#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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions drivers/video/aty/mach64_ct.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 5850e0c

Please sign in to comment.