* [PATCH] omap: rx51: Remove redefinition of rx51_aic3x_data
@ 2010-08-23 7:35 Jarkko Nikula
2010-08-23 9:58 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Jarkko Nikula @ 2010-08-23 7:35 UTC (permalink / raw)
To: alsa-devel; +Cc: Tony Lindgren, Mark Brown, Liam Girdwood
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>
---
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,
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] omap: rx51: Remove redefinition of rx51_aic3x_data
2010-08-23 7:35 [PATCH] omap: rx51: Remove redefinition of rx51_aic3x_data Jarkko Nikula
@ 2010-08-23 9:58 ` Mark Brown
2010-08-26 20:49 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2010-08-23 9:58 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: Tony Lindgren, alsa-devel, Liam Girdwood
On Mon, Aug 23, 2010 at 10:35:05AM +0300, Jarkko Nikula wrote:
> 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] omap: rx51: Remove redefinition of rx51_aic3x_data
2010-08-23 9:58 ` Mark Brown
@ 2010-08-26 20:49 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2010-08-26 20:49 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, Liam Girdwood
* Mark Brown <broonie@opensource.wolfsonmicro.com> [100823 02:51]:
> On Mon, Aug 23, 2010 at 10:35:05AM +0300, Jarkko Nikula wrote:
> > 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>
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-26 20:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-23 7:35 [PATCH] omap: rx51: Remove redefinition of rx51_aic3x_data Jarkko Nikula
2010-08-23 9:58 ` Mark Brown
2010-08-26 20:49 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).