diff options
| author | Nicolas Ferre | 2009-10-08 18:19:49 +0200 |
|---|---|---|
| committer | Mark Brown | 2009-10-09 13:41:55 +0200 |
| commit | 69d2c2ae1dffac5fcd6130e459f250ae035b678f (patch) | |
| tree | 98745fdd05070568e2b2163f666f200011c502aa /sound | |
| parent | Merge branch 'for-2.6.32' into for-2.6.33 (diff) | |
| download | kernel-qcow2-linux-69d2c2ae1dffac5fcd6130e459f250ae035b678f.tar.gz kernel-qcow2-linux-69d2c2ae1dffac5fcd6130e459f250ae035b678f.tar.xz kernel-qcow2-linux-69d2c2ae1dffac5fcd6130e459f250ae035b678f.zip | |
ASoC: at91sam9g20ek_2mmc board uses same audio connexion as at91sam9g20ek
The modified revision of at91sam9g20 Evaluation Kit rev. C and onwards share
with previous ones its audio connexion to Wolfson wm8731. Modify the SoC file
to extend the machine ID checking.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 885ba012557e..e028744c32ce 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -207,7 +207,7 @@ static int __init at91sam9g20ek_init(void) struct clk *pllb; int ret; - if (!machine_is_at91sam9g20ek()) + if (!(machine_is_at91sam9g20ek() || machine_is_at91sam9g20ek_2mmc())) return -ENODEV; /* |