From eff536cdc3a635d697c96582ea02541d6649e9da Mon Sep 17 00:00:00 2001 From: Matt Sealey Date: Fri, 3 Dec 2010 08:17:17 -0600 Subject: [PATCH] section mismatches fixed: * sanitize modelist used preferred_mode which was __initdata and shouldn't have been * init_wdog only runs once and accesses __initdata, so it's been made __init --- arch/arm/mach-mx5/mx51_efikamx_display.c | 2 +- arch/arm/mach-mx5/mx51_efikamx_io.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mx5/mx51_efikamx_display.c b/arch/arm/mach-mx5/mx51_efikamx_display.c index f6caf690f53..b9022893f65 100644 --- a/arch/arm/mach-mx5/mx51_efikamx_display.c +++ b/arch/arm/mach-mx5/mx51_efikamx_display.c @@ -46,7 +46,7 @@ u8 edid[256]; -struct fb_videomode __initdata preferred_mode; +struct fb_videomode preferred_mode; static struct mxc_iomux_pin_cfg __initdata mx51_efikamx_display_iomux_pins[] = { /* display reset pin */ diff --git a/arch/arm/mach-mx5/mx51_efikamx_io.c b/arch/arm/mach-mx5/mx51_efikamx_io.c index e1fe51e2ce4..820c9e81f70 100644 --- a/arch/arm/mach-mx5/mx51_efikamx_io.c +++ b/arch/arm/mach-mx5/mx51_efikamx_io.c @@ -82,7 +82,7 @@ static struct mxc_iomux_pin_cfg __initdata mx51_efikamx_wdog1_iomux_pins[] = { }, }; -void mx51_efikamx_init_wdog(void) +__init void mx51_efikamx_init_wdog(void) { /* Watchdog */