Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64a07133 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 13a7a6ac d7a6fe01

sound/soc/atmel/sam9g20_wm8731.c

+31 −37
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
#include <sound/pcm_params.h>

#include <sound/soc.h>



#include <asm/mach-types.h>



#include "../codecs/wm8731.h"

#include "atmel-pcm.h"

#include "atmel_ssc_dai.h"
@@ -171,8 +169,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) 
	int ret;



	if (!np) {

		if (!(machine_is_at91sam9g20ek() ||

			machine_is_at91sam9g20ek_2mmc()))

		return -ENODEV;

	}
@@ -210,7 +206,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;



	/* Parse device node info */

	if (np) {

	ret = snd_soc_of_parse_card_name(card, "atmel,model");

	if (ret)

		goto err;
@@ -242,7 +237,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) 


	of_node_put(codec_np);

	of_node_put(cpu_np);

	}



	ret = snd_soc_register_card(card);

	if (ret) {