Merge remote-tracking branch 'stable/build' into build

19 files changed, 21 insertions, 17 deletions

diff --git a/alsa/soc/fsl/eukrea-tlv320.c b/alsa/soc/fsl/eukrea-tlv320.c
new file mode 100644
index 000000000..02667a711
--- /dev/null
+++ b/alsa/soc/fsl/eukrea-tlv320.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/fsl/eukrea-tlv320.c"
diff --git a/alsa/soc/fsl/imx-pcm-fiq.c b/alsa/soc/fsl/imx-pcm-fiq.c
new file mode 100644
index 000000000..95ee957d3
--- /dev/null
+++ b/alsa/soc/fsl/imx-pcm-fiq.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/fsl/imx-pcm-fiq.c"
diff --git a/alsa/soc/fsl/imx-ssi.c b/alsa/soc/fsl/imx-ssi.c
new file mode 100644
index 000000000..58085408a
--- /dev/null
+++ b/alsa/soc/fsl/imx-ssi.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/fsl/imx-ssi.c"
diff --git a/alsa/soc/fsl/mx27vis_wm8974.c b/alsa/soc/fsl/mx27vis_wm8974.c
new file mode 100644
index 000000000..e9c45b3e1
--- /dev/null
+++ b/alsa/soc/fsl/mx27vis_wm8974.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/fsl/mx27vis_wm8974.c"
diff --git a/alsa/soc/fsl/phycore-ac97.c b/alsa/soc/fsl/phycore-ac97.c
new file mode 100644
index 000000000..1fd6c212b
--- /dev/null
+++ b/alsa/soc/fsl/phycore-ac97.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/fsl/phycore-ac97.c"
diff --git a/alsa/soc/fsl/wm1133-ev1.c b/alsa/soc/fsl/wm1133-ev1.c
new file mode 100644
index 000000000..68fad266a
--- /dev/null
+++ b/alsa/soc/fsl/wm1133-ev1.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/fsl/wm1133-ev1.c"
diff --git a/alsa/soc/imx/eukrea-tlv320.c b/alsa/soc/imx/eukrea-tlv320.c
deleted file mode 100644
index e89ac4041..000000000
--- a/alsa/soc/imx/eukrea-tlv320.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/imx/eukrea-tlv320.c"
diff --git a/alsa/soc/imx/imx-pcm-fiq.c b/alsa/soc/imx/imx-pcm-fiq.c
deleted file mode 100644
index 84ab8a7f6..000000000
--- a/alsa/soc/imx/imx-pcm-fiq.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/imx/imx-pcm-fiq.c"
diff --git a/alsa/soc/imx/imx-ssi.c b/alsa/soc/imx/imx-ssi.c
deleted file mode 100644
index a2200c0db..000000000
--- a/alsa/soc/imx/imx-ssi.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/imx/imx-ssi.c"
diff --git a/alsa/soc/imx/mx1_mx2-pcm.c b/alsa/soc/imx/mx1_mx2-pcm.c
deleted file mode 100644
index a67a91919..000000000
--- a/alsa/soc/imx/mx1_mx2-pcm.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/imx/mx1_mx2-pcm.c"
diff --git a/alsa/soc/imx/mx27vis_wm8974.c b/alsa/soc/imx/mx27vis_wm8974.c
deleted file mode 100644
index 42e94e48d..000000000
--- a/alsa/soc/imx/mx27vis_wm8974.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/imx/mx27vis_wm8974.c"
diff --git a/alsa/soc/imx/mxc-ssi.c b/alsa/soc/imx/mxc-ssi.c
deleted file mode 100644
index 8706fdf62..000000000
--- a/alsa/soc/imx/mxc-ssi.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/imx/mxc-ssi.c"
diff --git a/alsa/soc/imx/phycore-ac97.c b/alsa/soc/imx/phycore-ac97.c
deleted file mode 100644
index 72d436072..000000000
--- a/alsa/soc/imx/phycore-ac97.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/imx/phycore-ac97.c"
diff --git a/alsa/soc/imx/wm1133-ev1.c b/alsa/soc/imx/wm1133-ev1.c
deleted file mode 100644
index 619ab5b78..000000000
--- a/alsa/soc/imx/wm1133-ev1.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/imx/wm1133-ev1.c"
diff --git a/alsa/soc/imx/Makefile b/alsa/soc/rockchip/Makefile
index 4cc7c9094..f5e510387 100644
--- a/alsa/soc/imx/Makefile
+++ b/alsa/soc/rockchip/Makefile
@@ -5,6 +5,6 @@ endif
 include $(SND_TOPDIR)/toplevel.config
 include $(SND_TOPDIR)/Makefile.conf
 
-include $(SND_TOPDIR)/alsa-kernel/soc/imx/Makefile
+include $(SND_TOPDIR)/alsa-kernel/soc/rockchip/Makefile
 
 include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/rockchip/rockchip_i2s.c b/alsa/soc/rockchip/rockchip_i2s.c
new file mode 100644
index 000000000..650bf2056
--- /dev/null
+++ b/alsa/soc/rockchip/rockchip_i2s.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/rockchip/rockchip_i2s.c"
diff --git a/alsa/soc/soc-compress.c b/alsa/soc/soc-compress.c
new file mode 100644
index 000000000..e68b2ad0a
--- /dev/null
+++ b/alsa/soc/soc-compress.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../alsa-kernel/soc/soc-compress.c"
diff --git a/alsa/soc/soc-devres.c b/alsa/soc/soc-devres.c
new file mode 100644
index 000000000..0ba4d6c80
--- /dev/null
+++ b/alsa/soc/soc-devres.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../alsa-kernel/soc/soc-devres.c"
diff --git a/alsa/soc/soc-generic-dmaengine-pcm.c b/alsa/soc/soc-generic-dmaengine-pcm.c
new file mode 100644
index 000000000..4bdacfa64
--- /dev/null
+++ b/alsa/soc/soc-generic-dmaengine-pcm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../alsa-kernel/soc/soc-generic-dmaengine-pcm.c"