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

Commit 660c63a4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.33' into for-2.6.34

parents 640b796f 5bbd4953

sound/soc/codecs/tlv320aic23.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static int tlv320aic23_resume(struct platform_device *pdev) 
	u16 reg;



	/* Sync reg_cache with the hardware */

	for (reg = 0; reg < TLV320AIC23_RESET; reg++) {

	for (reg = 0; reg <= TLV320AIC23_ACTIVE; reg++) {

		u16 val = tlv320aic23_read_reg_cache(codec, reg);

		tlv320aic23_write(codec, reg, val);

	}

sound/soc/omap/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o 
obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o

obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o

obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o

obj-$(CONFIG_SND_OMAP_SOC_OMAP3517EVM) += snd-soc-am3517evm.o

obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o

obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o

obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o

obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o