diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 5138b8493051..463a9e25e04f 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -42,7 +42,7 @@ source "sound/soc/jz4740/Kconfig" source "sound/soc/nuc900/Kconfig" source "sound/soc/omap/Kconfig" source "sound/soc/kirkwood/Kconfig" -source "sound/soc/mid-x86/Kconfig" +source "sound/soc/intel/Kconfig" source "sound/soc/mxs/Kconfig" source "sound/soc/pxa/Kconfig" source "sound/soc/samsung/Kconfig" diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 8b9e70105dd2..ff291d3e60af 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_SND_SOC) += davinci/ obj-$(CONFIG_SND_SOC) += dwc/ obj-$(CONFIG_SND_SOC) += fsl/ obj-$(CONFIG_SND_SOC) += jz4740/ -obj-$(CONFIG_SND_SOC) += mid-x86/ +obj-$(CONFIG_SND_SOC) += intel/ obj-$(CONFIG_SND_SOC) += mxs/ obj-$(CONFIG_SND_SOC) += nuc900/ obj-$(CONFIG_SND_SOC) += omap/ diff --git a/sound/soc/mid-x86/Kconfig b/sound/soc/intel/Kconfig similarity index 100% rename from sound/soc/mid-x86/Kconfig rename to sound/soc/intel/Kconfig diff --git a/sound/soc/mid-x86/Makefile b/sound/soc/intel/Makefile similarity index 100% rename from sound/soc/mid-x86/Makefile rename to sound/soc/intel/Makefile diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/intel/mfld_machine.c similarity index 100% rename from sound/soc/mid-x86/mfld_machine.c rename to sound/soc/intel/mfld_machine.c diff --git a/sound/soc/mid-x86/sst_dsp.h b/sound/soc/intel/sst_dsp.h similarity index 100% rename from sound/soc/mid-x86/sst_dsp.h rename to sound/soc/intel/sst_dsp.h diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/intel/sst_platform.c similarity index 100% rename from sound/soc/mid-x86/sst_platform.c rename to sound/soc/intel/sst_platform.c diff --git a/sound/soc/mid-x86/sst_platform.h b/sound/soc/intel/sst_platform.h similarity index 100% rename from sound/soc/mid-x86/sst_platform.h rename to sound/soc/intel/sst_platform.h