Commit-ID: a8165e0e6f0511d14132423b4bce2d285e890fc8
Gitweb: http://git.kernel.org/tip/a8165e0e6f0511d14132423b4bce2d285e890fc8
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
AuthorDate: Mon, 23 Aug 2010 10:35:05 +0300
Committer: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
CommitDate: Mon, 23 Aug 2010 12:03:11 +0100
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@xxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
---
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 897d960..11ce4b2 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 = {
.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,
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|