From: Nicolas Ferre Date: Thu, 8 Oct 2009 16:19:49 +0000 (+0200) Subject: ASoC: at91sam9g20ek_2mmc board uses same audio connexion as at91sam9g20ek X-Git-Tag: v2.6.33-rc3~4^2~102 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69d2c2ae1dffac5fcd6130e459f250ae035b678f;p=platform%2Fkernel%2Flinux-3.10.git 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 Signed-off-by: Mark Brown --- diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 885ba01..e028744 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; /*