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

Commit b71951d6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents dd85ecc2 570a2429

sound/soc/codecs/uda1380.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

sound/soc/imx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

sound/soc/pxa/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -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