korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 16:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] atyfb: Fix section warnings

Browse Source 
Fix the following warning:

WARNING: drivers/video/aty/atyfb.o - Section mismatch: reference to
.init.text:aty_init_cursor from .text between 'aty_init' (at offset 0x241d)
and 'atyfb_blank'

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Antonino A. Daplas 2006-06-26 00:26:58 -07:00 committed by Linus Torvalds
parent 9b27915b6a
commit 1a8c979529
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/video/aty/atyfb_base.c
View File

@ -316,12 +316,12 @@ static int vram;
static int pll; static int pll;
static int mclk; static int mclk;
static int xclk; static int xclk;
static int comp_sync __initdata = -1; static int comp_sync __devinitdata = -1;
static char *mode; static char *mode;
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
static int default_vmode __initdata = VMODE_CHOOSE; static int default_vmode __devinitdata = VMODE_CHOOSE;
static int default_cmode __initdata = CMODE_CHOOSE; static int default_cmode __devinitdata = CMODE_CHOOSE;
module_param_named(vmode, default_vmode, int, 0); module_param_named(vmode, default_vmode, int, 0);
MODULE_PARM_DESC(vmode, "int: video mode for mac"); MODULE_PARM_DESC(vmode, "int: video mode for mac");
@ -330,10 +330,10 @@ MODULE_PARM_DESC(cmode, "int: color mode for mac");
#endif #endif
#ifdef CONFIG_ATARI #ifdef CONFIG_ATARI
static unsigned int mach64_count __initdata = 0; static unsigned int mach64_count __devinitdata = 0;
static unsigned long phys_vmembase[FB_MAX] __initdata = { 0, }; static unsigned long phys_vmembase[FB_MAX] __devinitdata = { 0, };
static unsigned long phys_size[FB_MAX] __initdata = { 0, }; static unsigned long phys_size[FB_MAX] __devinitdata = { 0, };
static unsigned long phys_guiregbase[FB_MAX] __initdata = { 0, }; static unsigned long phys_guiregbase[FB_MAX] __devinitdata = { 0, };
#endif #endif
/* top -> down is an evolution of mach64 chipset, any corrections? */ /* top -> down is an evolution of mach64 chipset, any corrections? */
@ -583,7 +583,7 @@ static u32 atyfb_get_pixclock(struct fb_var_screeninfo *var, struct atyfb_par *p
* Apple monitor sense * Apple monitor sense
*/ */
static int __init read_aty_sense(const struct atyfb_par *par) static int __devinit read_aty_sense(const struct atyfb_par *par)
{ {
int sense, i; int sense, i;
@ -2261,7 +2261,7 @@ static void aty_bl_exit(struct atyfb_par *par)
#endif /* CONFIG_FB_ATY_BACKLIGHT */ #endif /* CONFIG_FB_ATY_BACKLIGHT */
static void __init aty_calc_mem_refresh(struct atyfb_par *par, int xclk) static void __devinit aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
{ {
const int ragepro_tbl[] = { const int ragepro_tbl[] = {
44, 50, 55, 66, 75, 80, 100 44, 50, 55, 66, 75, 80, 100
@ -2321,7 +2321,7 @@ static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par,
} }
#endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */ #endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */
static int __init aty_init(struct fb_info *info, const char *name) static int __devinit aty_init(struct fb_info *info, const char *name)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
const char *ramname = NULL, *xtal; const char *ramname = NULL, *xtal;
@ -2748,7 +2748,7 @@ aty_init_exit:
} }
#ifdef CONFIG_ATARI #ifdef CONFIG_ATARI
static int __init store_video_par(char *video_str, unsigned char m64_num) static int __devinit store_video_par(char *video_str, unsigned char m64_num)
{ {
char *p; char *p;
unsigned long vmembase, size, guiregbase; unsigned long vmembase, size, guiregbase;
@ -3779,7 +3779,7 @@ static struct pci_driver atyfb_driver = {
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#ifndef MODULE #ifndef MODULE
static int __init atyfb_setup(char *options) static int __devinit atyfb_setup(char *options)
{ {
char *this_opt; char *this_opt;
@ -3851,7 +3851,7 @@ static int __init atyfb_setup(char *options)
} }
#endif /* MODULE */ #endif /* MODULE */
static int __init atyfb_init(void) static int __devinit atyfb_init(void)
{ {
#ifndef MODULE #ifndef MODULE
char *option = NULL; char *option = NULL;

2
drivers/video/aty/mach64_cursor.c
View File

@ -187,7 +187,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
return 0; return 0;
} }
int __init aty_init_cursor(struct fb_info *info) int __devinit aty_init_cursor(struct fb_info *info)
{ {
unsigned long addr; unsigned long addr;