diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-06 06:53:13 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-06 06:53:13 -0400 |
| commit | 2f02a59c559c28f777ea7d198da87f634cc809c0 (patch) | |
| tree | bc6194a304299d169239579fd3eaca5e511529f6 /arch | |
| parent | e6929378071a1ef68d1dc2f10c0b4a1bcc603f4c (diff) | |
| parent | c776357e0adc2a25bd22eb75155030132c88a0dd (diff) | |
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.37
Diffstat (limited to 'arch')
| -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 897d960fe16..11ce4b24bef 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, |