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

21 files changed, 66 insertions, 0 deletions

diff --git a/alsa/firewire/bebob/Makefile b/alsa/firewire/bebob/Makefile
new file mode 100644
index 000000000..4724ee7c8
--- /dev/null
+++ b/alsa/firewire/bebob/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/firewire/bebob/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/firewire/bebob/bebob.c b/alsa/firewire/bebob/bebob.c
new file mode 100644
index 000000000..3c14d3fc8
--- /dev/null
+++ b/alsa/firewire/bebob/bebob.c
@@ -0,0 +1,10 @@
+#include "adriver.h"
+
+/* workaround for missing prototype */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)
+struct fw_card;
+void fw_schedule_bus_reset(struct fw_card *card, bool delayed,
+			   bool short_reset);
+#endif
+
+#include "../../alsa-kernel/firewire/bebob/bebob.c"
diff --git a/alsa/firewire/bebob/bebob_command.c b/alsa/firewire/bebob/bebob_command.c
new file mode 100644
index 000000000..544176ed2
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_command.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_command.c"
diff --git a/alsa/firewire/bebob/bebob_focusrite.c b/alsa/firewire/bebob/bebob_focusrite.c
new file mode 100644
index 000000000..0ef9b2abd
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_focusrite.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_focusrite.c"
diff --git a/alsa/firewire/bebob/bebob_hwdep.c b/alsa/firewire/bebob/bebob_hwdep.c
new file mode 100644
index 000000000..dc03a9326
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_hwdep.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_hwdep.c"
diff --git a/alsa/firewire/bebob/bebob_maudio.c b/alsa/firewire/bebob/bebob_maudio.c
new file mode 100644
index 000000000..1753dcffd
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_maudio.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_maudio.c"
diff --git a/alsa/firewire/bebob/bebob_midi.c b/alsa/firewire/bebob/bebob_midi.c
new file mode 100644
index 000000000..387831da1
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_midi.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_midi.c"
diff --git a/alsa/firewire/bebob/bebob_pcm.c b/alsa/firewire/bebob/bebob_pcm.c
new file mode 100644
index 000000000..8c8609703
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_pcm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_pcm.c"
diff --git a/alsa/firewire/bebob/bebob_proc.c b/alsa/firewire/bebob/bebob_proc.c
new file mode 100644
index 000000000..f0c77753c
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_proc.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_proc.c"
diff --git a/alsa/firewire/bebob/bebob_stream.c b/alsa/firewire/bebob/bebob_stream.c
new file mode 100644
index 000000000..293702bda
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_stream.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_stream.c"
diff --git a/alsa/firewire/bebob/bebob_terratec.c b/alsa/firewire/bebob/bebob_terratec.c
new file mode 100644
index 000000000..913a9a2c1
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_terratec.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_terratec.c"
diff --git a/alsa/firewire/bebob/bebob_yamaha.c b/alsa/firewire/bebob/bebob_yamaha.c
new file mode 100644
index 000000000..dd30b390f
--- /dev/null
+++ b/alsa/firewire/bebob/bebob_yamaha.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/bebob/bebob_yamaha.c"
diff --git a/alsa/firewire/fireworks/Makefile b/alsa/firewire/fireworks/Makefile
new file mode 100644
index 000000000..faa1794ed
--- /dev/null
+++ b/alsa/firewire/fireworks/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/firewire/fireworks/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/firewire/fireworks/fireworks.c b/alsa/firewire/fireworks/fireworks.c
new file mode 100644
index 000000000..649ea5df7
--- /dev/null
+++ b/alsa/firewire/fireworks/fireworks.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/fireworks/fireworks.c"
diff --git a/alsa/firewire/fireworks/fireworks_command.c b/alsa/firewire/fireworks/fireworks_command.c
new file mode 100644
index 000000000..2c80173cb
--- /dev/null
+++ b/alsa/firewire/fireworks/fireworks_command.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/fireworks/fireworks_command.c"
diff --git a/alsa/firewire/fireworks/fireworks_hwdep.c b/alsa/firewire/fireworks/fireworks_hwdep.c
new file mode 100644
index 000000000..903ddac42
--- /dev/null
+++ b/alsa/firewire/fireworks/fireworks_hwdep.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/fireworks/fireworks_hwdep.c"
diff --git a/alsa/firewire/fireworks/fireworks_midi.c b/alsa/firewire/fireworks/fireworks_midi.c
new file mode 100644
index 000000000..66efcba2b
--- /dev/null
+++ b/alsa/firewire/fireworks/fireworks_midi.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/fireworks/fireworks_midi.c"
diff --git a/alsa/firewire/fireworks/fireworks_pcm.c b/alsa/firewire/fireworks/fireworks_pcm.c
new file mode 100644
index 000000000..20691c3ea
--- /dev/null
+++ b/alsa/firewire/fireworks/fireworks_pcm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/fireworks/fireworks_pcm.c"
diff --git a/alsa/firewire/fireworks/fireworks_proc.c b/alsa/firewire/fireworks/fireworks_proc.c
new file mode 100644
index 000000000..cd84df13d
--- /dev/null
+++ b/alsa/firewire/fireworks/fireworks_proc.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/fireworks/fireworks_proc.c"
diff --git a/alsa/firewire/fireworks/fireworks_stream.c b/alsa/firewire/fireworks/fireworks_stream.c
new file mode 100644
index 000000000..5c77c90ec
--- /dev/null
+++ b/alsa/firewire/fireworks/fireworks_stream.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/fireworks/fireworks_stream.c"
diff --git a/alsa/firewire/fireworks/fireworks_transaction.c b/alsa/firewire/fireworks/fireworks_transaction.c
new file mode 100644
index 000000000..3a4560641
--- /dev/null
+++ b/alsa/firewire/fireworks/fireworks_transaction.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/firewire/fireworks/fireworks_transaction.c"