diff options
| author | Jarkko Nikula <jhnikula@gmail.com> | 2010-12-18 18:17:10 +0000 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-20 18:48:16 -0800 |
| commit | f0c61d3d3c319def8feebb99682ae0223a41dffe (patch) | |
| tree | 6c168c7a9825a19384bc6b332301bae007a36914 /arch/arm/mach-omap2/board-rx51-peripherals.c | |
| parent | f861fc1766888858db6abd57adae3af7abc286ca (diff) | |
| download | kernel_samsung_smdk4412-f0c61d3d3c319def8feebb99682ae0223a41dffe.zip kernel_samsung_smdk4412-f0c61d3d3c319def8feebb99682ae0223a41dffe.tar.gz kernel_samsung_smdk4412-f0c61d3d3c319def8feebb99682ae0223a41dffe.tar.bz2 | |
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 <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 7ea2081..fd95ccf 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, }; |