diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-04 23:47:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-04 23:47:39 +0000 |
| commit | b71951d63d83194d449e8ec7b28c3f30176e8208 (patch) | |
| tree | 47b264ebcd35a947fef2dbd074bbe04760bc6474 /sound | |
| parent | dd85ecc269a3aa537fd045e113b4755a3cd1284f (diff) | |
| parent | 570a2429e964f8d63338b3450ba801a263b29b3a (diff) | |
| download | op-kernel-dev-b71951d63d83194d449e8ec7b28c3f30176e8208.zip op-kernel-dev-b71951d63d83194d449e8ec7b28c3f30176e8208.tar.gz | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/uda1380.c | 4 | ||||
| -rw-r--r-- | sound/soc/imx/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/pxa/Kconfig | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index d08b91d..39c228c 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c @@ -863,13 +863,13 @@ static struct i2c_driver uda1380_i2c_driver = { static int __init uda1380_modinit(void) { - int ret; + int ret = 0; #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) ret = i2c_add_driver(&uda1380_i2c_driver); if (ret != 0) pr_err("Failed to register UDA1380 I2C driver: %d\n", ret); #endif - return 0; + return ret; } module_init(uda1380_modinit); diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index b133bfc..7383917 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -28,7 +28,7 @@ config SND_MXC_SOC_WM1133_EV1 config SND_SOC_MX27VIS_AIC32X4 tristate "SoC audio support for Visstrim M10 boards" - depends on MACH_IMX27_VISSTRIM_M10 + depends on MACH_IMX27_VISSTRIM_M10 && I2C select SND_SOC_TLV320AIC32X4 select SND_MXC_SOC_MX2 help diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index ffd2242..a0f7d3c 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -151,6 +151,7 @@ config SND_SOC_ZYLONITE config SND_SOC_RAUMFELD tristate "SoC Audio support Raumfeld audio adapter" depends on SND_PXA2XX_SOC && (MACH_RAUMFELD_SPEAKER || MACH_RAUMFELD_CONNECTOR) + depends on I2C && SPI_MASTER select SND_PXA_SOC_SSP select SND_SOC_CS4270 select SND_SOC_AK4104 @@ -159,7 +160,7 @@ config SND_SOC_RAUMFELD config SND_PXA2XX_SOC_HX4700 tristate "SoC Audio support for HP iPAQ hx4700" - depends on SND_PXA2XX_SOC && MACH_H4700 + depends on SND_PXA2XX_SOC && MACH_H4700 && I2C select SND_PXA2XX_SOC_I2S select SND_SOC_AK4641 help |
