diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h
diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
diff --git a/sound/soc/mid-x86/Kconfig → sound/soc/intel/Kconfig b/sound/soc/mid-x86/Kconfig → sound/soc/intel/Kconfig
diff --git a/sound/soc/mid-x86/Makefile → sound/soc/intel/Makefile b/sound/soc/mid-x86/Makefile → sound/soc/intel/Makefile
diff --git a/sound/soc/mid-x86/mfld_machine.c → sound/soc/intel/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c → sound/soc/intel/mfld_machine.c
diff --git a/sound/soc/mid-x86/sst_dsp.h → sound/soc/intel/sst_dsp.h b/sound/soc/mid-x86/sst_dsp.h → sound/soc/intel/sst_dsp.h
diff --git a/sound/soc/mid-x86/sst_platform.c → sound/soc/intel/sst_platform.c b/sound/soc/mid-x86/sst_platform.c → sound/soc/intel/sst_platform.c
diff --git a/sound/soc/mid-x86/sst_platform.h → sound/soc/intel/sst_platform.h b/sound/soc/mid-x86/sst_platform.h → sound/soc/intel/sst_platform.h
diff --git a/sound/soc/jz4740/Kconfig b/sound/soc/jz4740/Kconfig
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
diff --git a/sound/soc/jz4740/jz4740-pcm.c b/sound/soc/jz4740/jz4740-pcm.c
diff --git a/sound/soc/jz4740/jz4740-pcm.h b/sound/soc/jz4740/jz4740-pcm.h
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
diff --git a/sound/soc/mxs/mxs-pcm.h b/sound/soc/mxs/mxs-pcm.h
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h
diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
diff --git a/sound/soc/samsung/regs-ac97.h b/sound/soc/samsung/regs-ac97.h
diff --git a/sound/soc/samsung/regs-iis.h b/sound/soc/samsung/regs-iis.h
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c
diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c
diff --git a/sound/soc/spear/spear_pcm.h b/sound/soc/spear/spear_pcm.h
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c
diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c
diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c