Commit 18f9f11a authored Jul 26, 2010 by Ralf Baechle

VIDEO. gbefb: Fix section mismatches.

WARNING: drivers/video/built-in.o(.devinit.text+0x54): Section mismatch in reference from the function gbefb_probe() to the function .init.text:gbefb_setup()
The function __devinit gbefb_probe() references
a function __init gbefb_setup().
If gbefb_setup is only used by gbefb_probe then
annotate gbefb_setup with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x208): Section mismatch in reference from the function gbefb_probe() to the variable .init.data:mode_option
The function __devinit gbefb_probe() references
a variable __initdata mode_option.
If mode_option is only used by gbefb_probe then
annotate mode_option with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x214): Section mismatch in reference from the function gbefb_probe() to the variable .init.data:default_mode
The function __devinit gbefb_probe() references
a variable __initdata default_mode.
If default_mode is only used by gbefb_probe then
annotate default_mode with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x23c): Section mismatch in reference from the function gbefb_probe() to the variable .init.data:default_var
The function __devinit gbefb_probe() references
a variable __initdata default_var.
If default_var is only used by gbefb_probe then
annotate default_var with a matching annotation.

Fixing these results in more mismatches:

WARNING: drivers/video/built-in.o(.devinit.text+0x3c): Section mismatch in reference from the function gbefb_setup() to the variable .init.data:default_var_LCD
The function __devinit gbefb_setup() references
a variable __initdata default_var_LCD.
If default_var_LCD is only used by gbefb_setup then
annotate default_var_LCD with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x14c): Section mismatch in reference from the function gbefb_setup() to the variable .init.data:default_mode_LCD
The function __devinit gbefb_setup() references
a variable __initdata default_mode_LCD.
If default_mode_LCD is only used by gbefb_setup then
annotate default_mode_LCD with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x150): Section mismatch in reference from the function gbefb_setup() to the variable .init.data:default_var_CRT
The function __devinit gbefb_setup() references
a variable __initdata default_var_CRT.
If default_var_CRT is only used by gbefb_setup then
annotate default_var_CRT with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x154): Section mismatch in reference from the function gbefb_setup() to the variable .init.data:default_mode_CRT
The function __devinit gbefb_setup() references
a variable __initdata default_mode_CRT.
If default_mode_CRT is only used by gbefb_setup then
annotate default_mode_CRT with a matching annotation.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 86c65a78

drivers/video/gbefb.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -91,10 +91,10 @@ static uint32_t pseudo_palette[16];
		static uint32_t gbe_cmap[256];
		static int gbe_turned_on; /* 0 turned off, 1 turned on */

		static char *mode_option __initdata = NULL;
		static char *mode_option __devinitdata = NULL;

		/* default CRT mode */
		static struct fb_var_screeninfo default_var_CRT __initdata = {
		static struct fb_var_screeninfo default_var_CRT __devinitdata = {
		/* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
		.xres = 640,
		.yres = 480,
		@@ -125,7 +125,7 @@ static struct fb_var_screeninfo default_var_CRT __initdata = {
		};

		/* default LCD mode */
		static struct fb_var_screeninfo default_var_LCD __initdata = {
		static struct fb_var_screeninfo default_var_LCD __devinitdata = {
		/* 1600x1024, 8 bpp */
		.xres = 1600,
		.yres = 1024,
		@@ -157,7 +157,7 @@ static struct fb_var_screeninfo default_var_LCD __initdata = {

		/* default modedb mode */
		/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */
		static struct fb_videomode default_mode_CRT __initdata = {
		static struct fb_videomode default_mode_CRT __devinitdata = {
		.refresh = 60,
		.xres = 640,
		.yres = 480,
		@@ -172,7 +172,7 @@ static struct fb_videomode default_mode_CRT __initdata = {
		.vmode = FB_VMODE_NONINTERLACED,
		};
		/* 1600x1024 SGI flatpanel 1600sw */
		static struct fb_videomode default_mode_LCD __initdata = {
		static struct fb_videomode default_mode_LCD __devinitdata = {
		/* 1600x1024, 8 bpp */
		.xres = 1600,
		.yres = 1024,
		@@ -186,8 +186,8 @@ static struct fb_videomode default_mode_LCD __initdata = {
		.vmode = FB_VMODE_NONINTERLACED,
		};

		static struct fb_videomode *default_mode __initdata = &default_mode_CRT;
		static struct fb_var_screeninfo *default_var __initdata = &default_var_CRT;
		static struct fb_videomode *default_mode __devinitdata = &default_mode_CRT;
		static struct fb_var_screeninfo *default_var __devinitdata = &default_var_CRT;

		static int flat_panel_enabled = 0;

		@@ -1098,7 +1098,7 @@ static void gbefb_create_sysfs(struct device *dev)
		* Initialization
		*/

		static int __init gbefb_setup(char *options)
		static int __devinit gbefb_setup(char *options)
		{
		char *this_opt;

Admin message