Commit 52fe1163 authored by Russell King's avatar Russell King
Browse files

ARM: RiscPC: acornfb: fix section mismatches 



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

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

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

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

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

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 56f3aeb2

drivers/video/acornfb.c

+10 −16
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 * have.  Allow 1% either way on the nominal for TVs.

 */

#define NR_MONTYPES	6

static struct fb_monspecs monspecs[NR_MONTYPES] __initdata = {

static struct fb_monspecs monspecs[NR_MONTYPES] __devinitdata = {

	{	/* TV		*/

		.hfmin	= 15469,

		.hfmax	= 15781,
@@ -873,7 +873,7 @@ static struct fb_ops acornfb_ops = { 
/*

 * Everything after here is initialisation!!!

 */

static struct fb_videomode modedb[] __initdata = {

static struct fb_videomode modedb[] __devinitdata = {

	{	/* 320x256 @ 50Hz */

		NULL, 50,  320,  256, 125000,  92,  62,  35, 19,  38, 2,

		FB_SYNC_COMP_HIGH_ACT,
@@ -925,8 +925,7 @@ static struct fb_videomode modedb[] __initdata = { 
	}

};



static struct fb_videomode __initdata

acornfb_default_mode = {

static struct fb_videomode acornfb_default_mode __devinitdata = {

	.name =		NULL,

	.refresh =	60,

	.xres =		640,
@@ -942,7 +941,7 @@ acornfb_default_mode = { 
	.vmode =	FB_VMODE_NONINTERLACED

};



static void __init acornfb_init_fbinfo(void)

static void __devinit acornfb_init_fbinfo(void)

{

	static int first = 1;
@@ -1018,8 +1017,7 @@ static void __init acornfb_init_fbinfo(void) 
 *	size can optionally be followed by 'M' or 'K' for

 *	MB or KB respectively.

 */

static void __init

acornfb_parse_mon(char *opt)

static void __devinit acornfb_parse_mon(char *opt)

{

	char *p = opt;
@@ -1066,8 +1064,7 @@ bad: 
	current_par.montype = -1;

}



static void __init

acornfb_parse_montype(char *opt)

static void __devinit acornfb_parse_montype(char *opt)

{

	current_par.montype = -2;
@@ -1108,8 +1105,7 @@ acornfb_parse_montype(char *opt) 
	}

}



static void __init

acornfb_parse_dram(char *opt)

static void __devinit acornfb_parse_dram(char *opt)

{

	unsigned int size;
@@ -1134,15 +1130,14 @@ acornfb_parse_dram(char *opt) 
static struct options {

	char *name;

	void (*parse)(char *opt);

} opt_table[] __initdata = {

} opt_table[] __devinitdata = {

	{ "mon",     acornfb_parse_mon     },

	{ "montype", acornfb_parse_montype },

	{ "dram",    acornfb_parse_dram    },

	{ NULL, NULL }

};



int __init

acornfb_setup(char *options)

static int __devinit acornfb_setup(char *options)

{

	struct options *optp;

	char *opt;
@@ -1179,8 +1174,7 @@ acornfb_setup(char *options) 
 * Detect type of monitor connected

 *  For now, we just assume SVGA

 */

static int __init

acornfb_detect_monitortype(void)

static int __devinit acornfb_detect_monitortype(void)

{

	return 4;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE