summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-08 10:43:49 +0100
committerTakashi Iwai <tiwai@suse.de>2014-01-08 10:45:15 +0100
commit810e6adc86bc8994ce00e1ea6dc788637c9db154 (patch)
tree1254ae8ae4537411a26e2ca89054fec59bd700fa
parentbfaebf4a648e9342f6bec59161043160e2497cf5 (diff)
downloadalsa-driver-build-unstable-810e6adc86bc8994ce00e1ea6dc788637c9db154.tar.gz
Rename soc/mid-x86 to soc/intel
Following upstream changes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--alsa/soc/intel/Makefile (renamed from alsa/soc/mid-x86/Makefile)2
-rw-r--r--alsa/soc/intel/mfld_machine.c2
-rw-r--r--alsa/soc/intel/sst_platform.c2
-rw-r--r--alsa/soc/mid-x86/mfld_machine.c2
-rw-r--r--alsa/soc/mid-x86/sst_platform.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/alsa/soc/mid-x86/Makefile b/alsa/soc/intel/Makefile
index d6885f3ae..21aacf0eb 100644
--- a/alsa/soc/mid-x86/Makefile
+++ b/alsa/soc/intel/Makefile
@@ -5,6 +5,6 @@ endif
include $(SND_TOPDIR)/toplevel.config
include $(SND_TOPDIR)/Makefile.conf
-include $(SND_TOPDIR)/alsa-kernel/soc/mid-x86/Makefile
+include $(SND_TOPDIR)/alsa-kernel/soc/intel/Makefile
include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/intel/mfld_machine.c b/alsa/soc/intel/mfld_machine.c
new file mode 100644
index 000000000..cb8936c0d
--- /dev/null
+++ b/alsa/soc/intel/mfld_machine.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/intel/mfld_machine.c"
diff --git a/alsa/soc/intel/sst_platform.c b/alsa/soc/intel/sst_platform.c
new file mode 100644
index 000000000..053c9809b
--- /dev/null
+++ b/alsa/soc/intel/sst_platform.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/intel/sst_platform.c"
diff --git a/alsa/soc/mid-x86/mfld_machine.c b/alsa/soc/mid-x86/mfld_machine.c
deleted file mode 100644
index 11cc3b820..000000000
--- a/alsa/soc/mid-x86/mfld_machine.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/mid-x86/mfld_machine.c"
diff --git a/alsa/soc/mid-x86/sst_platform.c b/alsa/soc/mid-x86/sst_platform.c
deleted file mode 100644
index 50e408bdf..000000000
--- a/alsa/soc/mid-x86/sst_platform.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/mid-x86/sst_platform.c"