From 44a5cfde0f913c6307435813f852ca5027d95171 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 8 Oct 2009 18:19:49 +0200 Subject: [PATCH] --- yaml --- r: 170167 b: refs/heads/master c: 69d2c2ae1dffac5fcd6130e459f250ae035b678f h: refs/heads/master i: 170165: 626ef12b10b690f5864b02783228ad702fa4bfbf 170163: 85dcb1832afe331ecf581e6b2e7f9454102236c8 170159: 73eeede06c2ab85b0fa804a0262994987d02aa99 v: v3 --- [refs] | 2 +- trunk/sound/soc/atmel/sam9g20_wm8731.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bfec0c060153..00a9bcf29fc8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b727916a1f79f7a6e4603747b36a51777cb074e0 +refs/heads/master: 69d2c2ae1dffac5fcd6130e459f250ae035b678f diff --git a/trunk/sound/soc/atmel/sam9g20_wm8731.c b/trunk/sound/soc/atmel/sam9g20_wm8731.c index 885ba012557e..e028744c32ce 100644 --- a/trunk/sound/soc/atmel/sam9g20_wm8731.c +++ b/trunk/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; /*