diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-08 16:52:02 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-08 16:52:02 +0000 |
| commit | 8bced693459cec5c3737f2492a2a8f1233b6614f (patch) | |
| tree | 65abd32b0909da910474b65d5e8cf118695c57ab | |
| parent | 0aa34b16f9f34a81bd50c097f1953877614220db (diff) | |
| parent | b0fc7b840926654a3a6eaf0f41f3a4da33441d3d (diff) | |
| download | linux-8bced693459cec5c3737f2492a2a8f1233b6614f.tar.gz linux-8bced693459cec5c3737f2492a2a8f1233b6614f.tar.xz | |
Merge branch 'for-2.6.37' into HEAD
| -rw-r--r-- | sound/soc/fsl/mpc5200_psc_i2s.c | 2 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/Kconfig | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index 74ffed41340f..9018fa5bf0db 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c @@ -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); diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index 8a6b53ccd203..d85bf8a0abb2 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig @@ -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 |