]> err.no Git - linux-2.6/commitdiff
[ARM] 4544/1: arm: fix section mismatch in pxa fb
authorSam Ravnborg <sam@ravnborg.org>
Tue, 7 Aug 2007 18:03:27 +0000 (19:03 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 11 Aug 2007 22:58:24 +0000 (23:58 +0100)
Fix following section mismatch warning:
WARNING: drivers/built-in.o(.text+0x73d0): Section mismatch: reference to .init.data: (between 'pxafb_setup' and 'pxafb_init')

The warning are caused by __devinit pxafb_setup() that refers to a
variable marked __initdata.  In a hotplug scenario we would have a
reference to the freed .init.data section.  Fix this by declaring
g_options __devinitdata.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/video/pxafb.c

index 81e571d59b50a949589162e5ca28681a45964e0f..a280a52f8efec27d49a440d604bd0cf9311440ba 100644 (file)
@@ -66,7 +66,7 @@ static void set_ctrlr_state(struct pxafb_info *fbi, u_int state);
 
 #ifdef CONFIG_FB_PXA_PARAMETERS
 #define PXAFB_OPTIONS_SIZE 256
-static char g_options[PXAFB_OPTIONS_SIZE] __initdata = "";
+static char g_options[PXAFB_OPTIONS_SIZE] __devinitdata = "";
 #endif
 
 static inline void pxafb_schedule_work(struct pxafb_info *fbi, u_int state)