omap: rx51: Remove redefinition of rx51_aic3x_data
authorJarkko Nikula <jhnikula@gmail.com>
Mon, 23 Aug 2010 07:35:05 +0000 (10:35 +0300)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 23 Aug 2010 11:03:11 +0000 (12:03 +0100)
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>
arch/arm/mach-omap2/board-rx51-peripherals.c

index 897d960fe16f686ae5d5ef37251334c6bb850481..11ce4b24befdc76aa441ede512542cc57e82f589 100644 (file)
@@ -710,10 +710,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
        .vio                    = &rx51_vio,
 };
 
-static struct aic3x_pdata rx51_aic3x_data __initdata = {
-       .gpio_reset             = 60,
-};
-
 static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = {
        .id                     = TPA6130A2,
        .power_gpio             = 98,