Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5850e0cf authored by Ville Syrjala's avatar Ville Syrjala Committed by Linus Torvalds
Browse files

[PATCH] atyfb: Fix __init and __devinit annotations 



Fix some __init and __devinit annotations.

Signed-off-by: default avatarVille Syrjala <syrjala@sci.fi>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 044aaa32

drivers/video/aty/atyfb_base.c

+4 −4
Original line number Diff line number Diff line
@@ -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 @@ 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;
@@ -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

drivers/video/aty/mach64_ct.c

+4 −4
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ 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,

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;
@@ -394,7 +394,7 @@ static void __init aty_get_pll_ct(const struct fb_info *info, 
	}

}



static int __init aty_init_pll_ct(const struct fb_info *info,

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;