Merge branch 'fix/hda' into topic/hda

2026-10-16 22:39:48 +00:00 · 2010-12-20 10:28:51 +01:00 · 2010-12-20 10:28:51 +01:00 · 67c6dc4df1
commit 67c6dc4df1
parent 30fac30103 022c92befa
39 changed files with 147 additions and 72 deletions
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
--- a/sound/soc/atmel/snd-soc-afeb9260.c
+++ b/sound/soc/atmel/snd-soc-afeb9260.c
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
--- a/sound/soc/davinci/davinci-vcif.c
+++ b/sound/soc/davinci/davinci-vcif.c
--- a/sound/soc/ep93xx/simone.c
+++ b/sound/soc/ep93xx/simone.c
--- a/sound/soc/fsl/efika-audio-fabric.c
+++ b/sound/soc/fsl/efika-audio-fabric.c
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
--- a/sound/soc/imx/phycore-ac97.c
+++ b/sound/soc/imx/phycore-ac97.c
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
--- a/sound/soc/nuc900/nuc900-audio.h
+++ b/sound/soc/nuc900/nuc900-audio.h
--- a/sound/soc/nuc900/nuc900-pcm.c
+++ b/sound/soc/nuc900/nuc900-pcm.c
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
--- a/sound/soc/s3c24xx/smdk_spdif.c
+++ b/sound/soc/s3c24xx/smdk_spdif.c
--- a/sound/soc/s6000/s6000-i2s.c
+++ b/sound/soc/s6000/s6000-i2s.c
--- a/sound/soc/s6000/s6000-pcm.c
+++ b/sound/soc/s6000/s6000-pcm.c
--- a/sound/soc/s6000/s6105-ipcam.c
+++ b/sound/soc/s6000/s6105-ipcam.c
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c