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

13 files changed, 44 insertions, 46 deletions

diff --git a/alsa/firewire/dice.patch b/alsa/firewire/dice.patch
deleted file mode 100644
index 276825c8b..000000000
--- a/alsa/firewire/dice.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- ../alsa-kernel/firewire/dice.c	2013-10-22 10:03:16.835007244 +0200
-+++ dice.c	2013-10-30 07:28:46.132508934 +0100
-@@ -1,3 +1,7 @@
-+#include "adriver.h"
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)
-+#include "iso-resources-old.h"
-+#endif
- /*
-  * TC Applied Technologies Digital Interface Communications Engine driver
-  *
-@@ -1468,15 +1472,34 @@
- };
- MODULE_DEVICE_TABLE(ieee1394, dice_id_table);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)
-+static int __dice_probe(struct device *dev)
-+{
-+	return dice_probe(fw_unit(dev), NULL);
-+}
-+
-+static int __dice_remove(struct device *dev)
-+{
-+	dice_remove(fw_unit(dev));
-+	return 0;
-+}
-+#endif
-+
- static struct fw_driver dice_driver = {
- 	.driver   = {
- 		.owner	= THIS_MODULE,
- 		.name	= KBUILD_MODNAME,
- 		.bus	= &fw_bus_type,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)
-+		.probe    = __dice_probe,
-+		.remove   = __dice_remove,
-+#endif
- 	},
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
- 	.probe    = dice_probe,
--	.update   = dice_bus_reset,
- 	.remove   = dice_remove,
-+#endif
-+	.update   = dice_bus_reset,
- 	.id_table = dice_id_table,
- };
- 
diff --git a/alsa/firewire/dice/Makefile b/alsa/firewire/dice/Makefile
new file mode 100644
index 000000000..552991816
--- /dev/null
+++ b/alsa/firewire/dice/Makefile
@@ -0,0 +1,12 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/firewire/dice/Makefile
+
+EXTRA_CFLAGS += -I$(SND_TOPDIR)/alsa-kernel/firewire
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/firewire/dice/dice-hwdep.c b/alsa/firewire/dice/dice-hwdep.c
new file mode 100644
index 000000000..6b21ae297
--- /dev/null
+++ b/alsa/firewire/dice/dice-hwdep.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/dice/dice-hwdep.c"
diff --git a/alsa/firewire/dice/dice-pcm.c b/alsa/firewire/dice/dice-pcm.c
new file mode 100644
index 000000000..c6aa0b021
--- /dev/null
+++ b/alsa/firewire/dice/dice-pcm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/dice/dice.c"
diff --git a/alsa/firewire/dice/dice-proc.c b/alsa/firewire/dice/dice-proc.c
new file mode 100644
index 000000000..aaf72ba2d
--- /dev/null
+++ b/alsa/firewire/dice/dice-proc.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/dice/dice-proc.c"
diff --git a/alsa/firewire/dice/dice-stream.c b/alsa/firewire/dice/dice-stream.c
new file mode 100644
index 000000000..dba0cbfa2
--- /dev/null
+++ b/alsa/firewire/dice/dice-stream.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/dice/dice-stream.c"
diff --git a/alsa/firewire/dice/dice-transaction.c b/alsa/firewire/dice/dice-transaction.c
new file mode 100644
index 000000000..bda37f27b
--- /dev/null
+++ b/alsa/firewire/dice/dice-transaction.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/dice/dice-transaction.c"
diff --git a/alsa/firewire/dice/dice.c b/alsa/firewire/dice/dice.c
new file mode 100644
index 000000000..c6aa0b021
--- /dev/null
+++ b/alsa/firewire/dice/dice.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/dice/dice.c"
diff --git a/alsa/firewire/oxfw/Makefile b/alsa/firewire/oxfw/Makefile
new file mode 100644
index 000000000..20f1f93dc
--- /dev/null
+++ b/alsa/firewire/oxfw/Makefile
@@ -0,0 +1,12 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/firewire/oxfw/Makefile
+
+EXTRA_CFLAGS += -I$(SND_TOPDIR)/alsa-kernel/firewire
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/firewire/oxfw/oxfw-control.c b/alsa/firewire/oxfw/oxfw-control.c
new file mode 100644
index 000000000..58902911e
--- /dev/null
+++ b/alsa/firewire/oxfw/oxfw-control.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/oxfw/oxfw-control.c"
diff --git a/alsa/firewire/oxfw/oxfw-pcm.c b/alsa/firewire/oxfw/oxfw-pcm.c
new file mode 100644
index 000000000..4962c6f71
--- /dev/null
+++ b/alsa/firewire/oxfw/oxfw-pcm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/oxfw/oxfw-pcm.c"
diff --git a/alsa/firewire/oxfw/oxfw-stream.c b/alsa/firewire/oxfw/oxfw-stream.c
new file mode 100644
index 000000000..b9dd63241
--- /dev/null
+++ b/alsa/firewire/oxfw/oxfw-stream.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/oxfw/oxfw-stream.c"
diff --git a/alsa/firewire/oxfw/oxfw.c b/alsa/firewire/oxfw/oxfw.c
new file mode 100644
index 000000000..a30c20801
--- /dev/null
+++ b/alsa/firewire/oxfw/oxfw.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/oxfw/oxfw.c"