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

Commit 8bced693 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into HEAD

parents 0aa34b16 b0fc7b84

sound/soc/fsl/mpc5200_psc_i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op, 
	rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai));

	if (rc != 0) {

		pr_err("Failed to register DAI\n");

		return 0;

		return rc;

	}



	psc_dma = dev_get_drvdata(&op->dev);

sound/soc/s3c24xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config SND_S3C24XX_SOC 
	tristate "SoC Audio for the Samsung S3CXXXX chips"

	depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210

	select S3C64XX_DMA if ARCH_S3C64XX

	select S3C2410_DMA if ARCH_S3C2410

	help

	  Say Y or M if you want to add support for codecs attached to

	  the S3C24XX AC97 or I2S interfaces. You will also need to