summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-08-31 16:43:08 +0200
committerTakashi Iwai <tiwai@suse.de>2015-08-31 16:43:08 +0200
commit964cd0079d4c72b521e6f1eb7aeb2d9dadc54f11 (patch)
tree02baabb777494b8ae19b0454c1afeb743f712b1c
parent61807cd098e34525c4ef418c897db1efbb576317 (diff)
parent5976c9c36159178990071766e088607a1cc959f8 (diff)
downloadalsa-driver-build-unstable-964cd0079d4c72b521e6f1eb7aeb2d9dadc54f11.tar.gz
Merge remote-tracking branch 'stable/build' into build
-rw-r--r--alsa/soc/intel/skylake/Makefile10
-rw-r--r--alsa/soc/intel/skylake/skl-nhlt.c2
-rw-r--r--alsa/soc/intel/skylake/skl-pcm.c2
-rw-r--r--alsa/soc/intel/skylake/skl-sst-cldma.c2
-rw-r--r--alsa/soc/intel/skylake/skl-sst-dsp.c2
-rw-r--r--alsa/soc/intel/skylake/skl-sst-ipc.c2
-rw-r--r--alsa/soc/intel/skylake/skl-sst.c2
-rw-r--r--alsa/soc/intel/skylake/skl.c2
-rw-r--r--alsa/soc/sti/Makefile10
-rw-r--r--alsa/soc/sti/sti_uniperif.c2
-rw-r--r--alsa/soc/sti/uniperif_player.c2
-rw-r--r--alsa/soc/sti/uniperif_reader.c2
12 files changed, 40 insertions, 0 deletions
diff --git a/alsa/soc/intel/skylake/Makefile b/alsa/soc/intel/skylake/Makefile
new file mode 100644
index 000000000..96aadb626
--- /dev/null
+++ b/alsa/soc/intel/skylake/Makefile
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/intel/skylake/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/intel/skylake/skl-nhlt.c b/alsa/soc/intel/skylake/skl-nhlt.c
new file mode 100644
index 000000000..a392a1949
--- /dev/null
+++ b/alsa/soc/intel/skylake/skl-nhlt.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/skylake/skl-nhlt.c"
diff --git a/alsa/soc/intel/skylake/skl-pcm.c b/alsa/soc/intel/skylake/skl-pcm.c
new file mode 100644
index 000000000..cb5e206b4
--- /dev/null
+++ b/alsa/soc/intel/skylake/skl-pcm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/skylake/skl-pcm.c"
diff --git a/alsa/soc/intel/skylake/skl-sst-cldma.c b/alsa/soc/intel/skylake/skl-sst-cldma.c
new file mode 100644
index 000000000..db6865bc3
--- /dev/null
+++ b/alsa/soc/intel/skylake/skl-sst-cldma.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/skylake/skl-sst-cldma.c"
diff --git a/alsa/soc/intel/skylake/skl-sst-dsp.c b/alsa/soc/intel/skylake/skl-sst-dsp.c
new file mode 100644
index 000000000..6ad4aa2db
--- /dev/null
+++ b/alsa/soc/intel/skylake/skl-sst-dsp.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/skylake/skl-sst-dsp.c"
diff --git a/alsa/soc/intel/skylake/skl-sst-ipc.c b/alsa/soc/intel/skylake/skl-sst-ipc.c
new file mode 100644
index 000000000..f359d5d3d
--- /dev/null
+++ b/alsa/soc/intel/skylake/skl-sst-ipc.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/skylake/skl-sst-ipc.c"
diff --git a/alsa/soc/intel/skylake/skl-sst.c b/alsa/soc/intel/skylake/skl-sst.c
new file mode 100644
index 000000000..12e8a0326
--- /dev/null
+++ b/alsa/soc/intel/skylake/skl-sst.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/skylake/skl-sst.c"
diff --git a/alsa/soc/intel/skylake/skl.c b/alsa/soc/intel/skylake/skl.c
new file mode 100644
index 000000000..7e4f261f6
--- /dev/null
+++ b/alsa/soc/intel/skylake/skl.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/skylake/skl.c"
diff --git a/alsa/soc/sti/Makefile b/alsa/soc/sti/Makefile
new file mode 100644
index 000000000..7c0d5fd06
--- /dev/null
+++ b/alsa/soc/sti/Makefile
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/sti/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/sti/sti_uniperif.c b/alsa/soc/sti/sti_uniperif.c
new file mode 100644
index 000000000..a6a1f48b7
--- /dev/null
+++ b/alsa/soc/sti/sti_uniperif.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/sti/sti_uniperif.c"
diff --git a/alsa/soc/sti/uniperif_player.c b/alsa/soc/sti/uniperif_player.c
new file mode 100644
index 000000000..50e44ce47
--- /dev/null
+++ b/alsa/soc/sti/uniperif_player.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/sti/uniperif_player.c"
diff --git a/alsa/soc/sti/uniperif_reader.c b/alsa/soc/sti/uniperif_reader.c
new file mode 100644
index 000000000..8e797ed8c
--- /dev/null
+++ b/alsa/soc/sti/uniperif_reader.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/sti/uniperif_reader.c"