diff options
author | Jarkko Nikula <jhnikula@gmail.com> | 2010-08-23 03:35:05 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-23 07:03:11 -0400 |
commit | a8165e0e6f0511d14132423b4bce2d285e890fc8 (patch) | |
tree | 8c21efb1a48575fa0b0dbd208dfd1c14160a4c92 | |
parent | 4fff7a5ccc00832039ae1c5138f9030079b6604d (diff) |
omap: rx51: Remove redefinition of rx51_aic3x_data
Redefinition of rx51_aic3x_data got introduced when merging upstread changes
for 2.6.36 and ASoC Multi-Component Support.
This must go together with multi-component commit f0fba2a.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 897d960fe16f..11ce4b24befd 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -710,10 +710,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = { | |||
710 | .vio = &rx51_vio, | 710 | .vio = &rx51_vio, |
711 | }; | 711 | }; |
712 | 712 | ||
713 | static struct aic3x_pdata rx51_aic3x_data __initdata = { | ||
714 | .gpio_reset = 60, | ||
715 | }; | ||
716 | |||
717 | static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { | 713 | static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { |
718 | .id = TPA6130A2, | 714 | .id = TPA6130A2, |
719 | .power_gpio = 98, | 715 | .power_gpio = 98, |