diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/Makefile | 2 | ||||
| -rw-r--r-- | sound/soc/intel/Kconfig (renamed from sound/soc/mid-x86/Kconfig) | 0 | ||||
| -rw-r--r-- | sound/soc/intel/Makefile (renamed from sound/soc/mid-x86/Makefile) | 0 | ||||
| -rw-r--r-- | sound/soc/intel/mfld_machine.c (renamed from sound/soc/mid-x86/mfld_machine.c) | 0 | ||||
| -rw-r--r-- | sound/soc/intel/sst_dsp.h (renamed from sound/soc/mid-x86/sst_dsp.h) | 0 | ||||
| -rw-r--r-- | sound/soc/intel/sst_platform.c (renamed from sound/soc/mid-x86/sst_platform.c) | 0 | ||||
| -rw-r--r-- | sound/soc/intel/sst_platform.h (renamed from sound/soc/mid-x86/sst_platform.h) | 0 |
8 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 5138b849305..463a9e25e04 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 8b9e70105dd..ff291d3e60a 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 index 61c10bf503d..61c10bf503d 100644 --- a/sound/soc/mid-x86/Kconfig +++ b/sound/soc/intel/Kconfig diff --git a/sound/soc/mid-x86/Makefile b/sound/soc/intel/Makefile index 63988333946..63988333946 100644 --- a/sound/soc/mid-x86/Makefile +++ b/sound/soc/intel/Makefile diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/intel/mfld_machine.c index d3d4c32434f..d3d4c32434f 100644 --- a/sound/soc/mid-x86/mfld_machine.c +++ b/sound/soc/intel/mfld_machine.c diff --git a/sound/soc/mid-x86/sst_dsp.h b/sound/soc/intel/sst_dsp.h index 0fce1de284f..0fce1de284f 100644 --- a/sound/soc/mid-x86/sst_dsp.h +++ b/sound/soc/intel/sst_dsp.h diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/intel/sst_platform.c index b6b5eb698d3..b6b5eb698d3 100644 --- a/sound/soc/mid-x86/sst_platform.c +++ b/sound/soc/intel/sst_platform.c diff --git a/sound/soc/mid-x86/sst_platform.h b/sound/soc/intel/sst_platform.h index cacc9066ec5..cacc9066ec5 100644 --- a/sound/soc/mid-x86/sst_platform.h +++ b/sound/soc/intel/sst_platform.h |