diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-06-28 14:17:48 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-29 08:24:29 -0400 |
commit | 7685e0165b36ae034dd5e67b7fbbee7e74604f38 (patch) | |
tree | 94f7303a9f83659996c7fc63affb1ce5ac58a4d6 /sound | |
parent | 8a08f4c4f24b4dfe7ff08542868e2b434c96221f (diff) |
ASoC: pxa2xx: fixup multi-platform AC'97 build failures
commit b047e1cc (ASoC: ac97: Support multi-platform AC'97) introduced
some build failures for the pxa2xx-ac97 support, fix them.
Cc: Mark Brown <broonie@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index a3c22ba25f08..1475515712e6 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c | |||
@@ -238,6 +238,8 @@ static const struct snd_soc_component_driver pxa_ac97_component = { | |||
238 | 238 | ||
239 | static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) | 239 | static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) |
240 | { | 240 | { |
241 | int ret; | ||
242 | |||
241 | if (pdev->id != -1) { | 243 | if (pdev->id != -1) { |
242 | dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n"); | 244 | dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n"); |
243 | return -ENXIO; | 245 | return -ENXIO; |
diff --git a/sound/soc/pxa/pxa2xx-ac97.h b/sound/soc/pxa/pxa2xx-ac97.h index eda891e6f31b..a49c21ba3842 100644 --- a/sound/soc/pxa/pxa2xx-ac97.h +++ b/sound/soc/pxa/pxa2xx-ac97.h | |||
@@ -14,7 +14,4 @@ | |||
14 | #define PXA2XX_DAI_AC97_AUX 1 | 14 | #define PXA2XX_DAI_AC97_AUX 1 |
15 | #define PXA2XX_DAI_AC97_MIC 2 | 15 | #define PXA2XX_DAI_AC97_MIC 2 |
16 | 16 | ||
17 | /* platform data */ | ||
18 | extern struct snd_ac97_bus_ops pxa2xx_ac97_ops; | ||
19 | |||
20 | #endif | 17 | #endif |