From: Jarkko Nikula Date: Sat, 18 Dec 2010 18:17:10 +0000 (+0000) Subject: omap: rx51: Switch rx51_tpa6130a2_data __initdata to__initdata_or_module X-Git-Tag: MMI-PSA29.97-13-9~21439^2~20 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f0c61d3d3c319def8feebb99682ae0223a41dffe;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git omap: rx51: Switch rx51_tpa6130a2_data __initdata to__initdata_or_module If the TPA6130 is compiled as module the id and power_gpio values are arbitrary at module probing time since the rx51_tpa6130a2_data was marked as __initdata. Fix this by using __initdata_or_module. Then __initdata is defined only if the kernel is built without CONFIG_MODULES and omitted otherwise. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 7ea20813083d..fd95ccf8be5c 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -722,7 +722,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = { .vio = &rx51_vio, }; -static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { +static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module = { .id = TPA6130A2, .power_gpio = 98, };