diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-29 14:31:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-29 14:31:06 +0000 |
| commit | 660c63a4a289a835aa9af93a45884c5d0c004b20 (patch) | |
| tree | 46f6ecc2a506002ef937fab16a9cfad845036e37 | |
| parent | 640b796f2ca88113bf2fefd380bc807092ce6fa1 (diff) | |
| parent | 5bbd4953a4fb5d8d597b4a53b8da97eee320b634 (diff) | |
| download | op-kernel-dev-660c63a4a289a835aa9af93a45884c5d0c004b20.zip op-kernel-dev-660c63a4a289a835aa9af93a45884c5d0c004b20.tar.gz | |
Merge branch 'for-2.6.33' into for-2.6.34
| -rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index a9dc5fb..da589d8 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -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); } diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 3db8a6c..19283e5 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -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 |
