OpenCloudOS-Kernel/sound/soc/ux500
Lee Jones 0530494933 ASoC: ux500_msp_i2s: Fix devm_* and return code merge error
Some ux500_msp_i2s patches clashed with:

b18e93a493
ASoC: ux500_msp_i2s: better use devm functions and fix error return code

... leaving the driver uncompilable. This patch fixes the
issues encountered.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-10-16 14:14:31 +09:00
..
Kconfig ASoC: Ux500: Add machine-driver 2012-06-17 20:46:12 +01:00
Makefile ASoC: Ux500: Add machine-driver 2012-06-17 20:46:12 +01:00
mop500.c ASoC: Ux500: Dispose of device nodes correctly 2012-10-16 14:14:24 +09:00
mop500_ab8500.c ASoC: Ux500: Add machine-driver 2012-06-17 20:46:12 +01:00
mop500_ab8500.h ASoC: Ux500: Add machine-driver 2012-06-17 20:46:12 +01:00
ux500_msp_dai.c Merge remote-tracking branch 'asoc/topic/ux500' into for-3.7 2012-09-22 18:47:58 -04:00
ux500_msp_dai.h ASoC: Ux500: Add MSP I2S-driver 2012-05-09 12:52:59 +01:00
ux500_msp_i2s.c ASoC: ux500_msp_i2s: Fix devm_* and return code merge error 2012-10-16 14:14:31 +09:00
ux500_msp_i2s.h ASoC: Ux500: Move MSP pinctrl setup into the MSP driver 2012-09-20 09:10:56 +02:00
ux500_pcm.c ASoC: dmaengine-pcm: Rename and deprecate snd_dmaengine_pcm_pointer 2012-06-20 15:38:32 +01:00
ux500_pcm.h ASoC: Ux500: Add platform-driver 2012-06-03 13:06:38 +01:00