diff options
| -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 5138b8493051..463a9e25e04f 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig | |||
| @@ -42,7 +42,7 @@ source "sound/soc/jz4740/Kconfig" | |||
| 42 | source "sound/soc/nuc900/Kconfig" | 42 | source "sound/soc/nuc900/Kconfig" |
| 43 | source "sound/soc/omap/Kconfig" | 43 | source "sound/soc/omap/Kconfig" |
| 44 | source "sound/soc/kirkwood/Kconfig" | 44 | source "sound/soc/kirkwood/Kconfig" |
| 45 | source "sound/soc/mid-x86/Kconfig" | 45 | source "sound/soc/intel/Kconfig" |
| 46 | source "sound/soc/mxs/Kconfig" | 46 | source "sound/soc/mxs/Kconfig" |
| 47 | source "sound/soc/pxa/Kconfig" | 47 | source "sound/soc/pxa/Kconfig" |
| 48 | source "sound/soc/samsung/Kconfig" | 48 | 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/ | |||
| 16 | obj-$(CONFIG_SND_SOC) += dwc/ | 16 | obj-$(CONFIG_SND_SOC) += dwc/ |
| 17 | obj-$(CONFIG_SND_SOC) += fsl/ | 17 | obj-$(CONFIG_SND_SOC) += fsl/ |
| 18 | obj-$(CONFIG_SND_SOC) += jz4740/ | 18 | obj-$(CONFIG_SND_SOC) += jz4740/ |
| 19 | obj-$(CONFIG_SND_SOC) += mid-x86/ | 19 | obj-$(CONFIG_SND_SOC) += intel/ |
| 20 | obj-$(CONFIG_SND_SOC) += mxs/ | 20 | obj-$(CONFIG_SND_SOC) += mxs/ |
| 21 | obj-$(CONFIG_SND_SOC) += nuc900/ | 21 | obj-$(CONFIG_SND_SOC) += nuc900/ |
| 22 | obj-$(CONFIG_SND_SOC) += omap/ | 22 | obj-$(CONFIG_SND_SOC) += omap/ |
diff --git a/sound/soc/mid-x86/Kconfig b/sound/soc/intel/Kconfig index 61c10bf503d2..61c10bf503d2 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 639883339465..639883339465 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 d3d4c32434f7..d3d4c32434f7 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 0fce1de284ff..0fce1de284ff 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 b6b5eb698d33..b6b5eb698d33 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 cacc9066ec52..cacc9066ec52 100644 --- a/sound/soc/mid-x86/sst_platform.h +++ b/sound/soc/intel/sst_platform.h | |||