leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/atmel-build' into asoc-linus

Browse Source
This commit is contained in:
Mark Brown 2015-03-04 20:42:37 +00:00
commit 64a071331a
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/atmel/sam9g20_wm8731.c
View File

@ -46,8 +46,6 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <asm/mach-types.h>
#include "../codecs/wm8731.h" #include "../codecs/wm8731.h"
#include "atmel-pcm.h" #include "atmel-pcm.h"
#include "atmel_ssc_dai.h" #include "atmel_ssc_dai.h"
@ -171,8 +169,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
int ret; int ret;
if (!np) { if (!np) {
if (!(machine_is_at91sam9g20ek() ||
machine_is_at91sam9g20ek_2mmc()))
return -ENODEV; return -ENODEV;
} }
@ -210,7 +206,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
card->dev = &pdev->dev; card->dev = &pdev->dev;
/* Parse device node info */ /* Parse device node info */
if (np) {
ret = snd_soc_of_parse_card_name(card, "atmel,model"); ret = snd_soc_of_parse_card_name(card, "atmel,model");
if (ret) if (ret)
goto err; goto err;
@ -242,7 +237,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
of_node_put(codec_np); of_node_put(codec_np);
of_node_put(cpu_np); of_node_put(cpu_np);
}
ret = snd_soc_register_card(card); ret = snd_soc_register_card(card);
if (ret) { if (ret) {