Merge branch 'for-2.6.37' into HEAD
This commit is contained in:
commit
8bced69345
2 changed files with 2 additions and 1 deletions
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
Reference in a new issue