* [PATCH] linux-next: fix pxa2xx-ac97.c breakage
@ 2009-09-04 19:16 Robert Schwebel
2009-09-04 19:21 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Robert Schwebel @ 2009-09-04 19:16 UTC (permalink / raw)
To: Marek Vasut, Mark Brown; +Cc: linux-kernel, kernel, armlinux
Today's linux-next fails to build with
sound/arm/pxa2xx-ac97.c: In function 'pxa2xx_ac97_probe':
sound/arm/pxa2xx-ac97.c:211: error: 'pxa2xx_audio_ops_t' has no member named 'codec_data'
make[2]: *** [sound/arm/pxa2xx-ac97.o] Error 1
It looks like commit e2365bf313fb21b49b1e4c911033389564428d03 has
introduced this; patch below.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
sound/arm/pxa2xx-ac97.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 3983aee..b4b48af 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -208,7 +208,7 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
snprintf(card->longname, sizeof(card->longname),
"%s (%s)", dev->dev.driver->name, card->mixername);
- if (pdata && pdata->codec_data[0])
+ if (pdata && pdata->codec_pdata[0])
snd_ac97_dev_add_pdata(ac97_bus->codec[0], pdata->codec_pdata[0]);
snd_card_set_dev(card, &dev->dev);
ret = snd_card_register(card);
--
1.5.6.5
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] linux-next: fix pxa2xx-ac97.c breakage
2009-09-04 19:16 [PATCH] linux-next: fix pxa2xx-ac97.c breakage Robert Schwebel
@ 2009-09-04 19:21 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2009-09-04 19:21 UTC (permalink / raw)
To: Robert Schwebel; +Cc: Marek Vasut, linux-kernel, kernel, armlinux
On Fri, Sep 04, 2009 at 09:16:36PM +0200, Robert Schwebel wrote:
> Today's linux-next fails to build with
> sound/arm/pxa2xx-ac97.c: In function 'pxa2xx_ac97_probe':
> sound/arm/pxa2xx-ac97.c:211: error: 'pxa2xx_audio_ops_t' has no member named 'codec_data'
> make[2]: *** [sound/arm/pxa2xx-ac97.o] Error 1
> It looks like commit e2365bf313fb21b49b1e4c911033389564428d03 has
> introduced this; patch below.
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-04 19:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-04 19:16 [PATCH] linux-next: fix pxa2xx-ac97.c breakage Robert Schwebel
2009-09-04 19:21 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox