diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:41 +0100 |
| commit | baf9226667734579e344f612ed39f727079cad51 (patch) | |
| tree | 9744efb5f1838ea73b695a0ab862547fdcf92ecf /sound/soc/atmel/sam9g20_wm8731.c | |
| parent | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (diff) | |
| parent | 43f0de8d0298e624e6c3bf2185b6003a59b331bd (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/atmel/sam9g20_wm8731.c')
| -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 885ba012557..e028744c32c 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; /* |