summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2009-09-04 21:16:36 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-09-04 20:19:56 +0100
commit367da1527aff2a4f789d03082f9fb191cdf332c4 (patch)
tree3651dd056076b4b99234a16fdeac08ad8044b994
parent2eff31e8096513d03b0b6484b85fd2c417eb87e8 (diff)
downloadop-kernel-dev-367da1527aff2a4f789d03082f9fb191cdf332c4.zip
op-kernel-dev-367da1527aff2a4f789d03082f9fb191cdf332c4.tar.gz
ASoC: fix pxa2xx-ac97.c breakage
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> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/arm/pxa2xx-ac97.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 757b480..4e34d19 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -207,7 +207,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);
OpenPOWER on IntegriCloud