add firewire build stubs

Add build stubs and related support for the new FireWire modules.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

12 files changed, 46 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 9af188fa7..c953e4370 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 ifneq ($(KERNELRELEASE),)
 # call from 2.6 kernel build system
 
-obj-m += acore/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ sh/ pcmcia/ aoa/ soc/ misc/
+obj-m += acore/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ sh/ pcmcia/ aoa/ soc/ misc/ firewire/
 
 else
 
@@ -104,6 +104,12 @@ endif
 ifeq (m,$(CONFIG_AC97_BUS))
 SUBDIRS  += misc
 endif
+ifeq (y,$(CONFIG_FIREWIRE))
+SUBDIRS  += firewire
+endif
+ifeq (m,$(CONFIG_FIREWIRE))
+SUBDIRS  += firewire
+endif
 CSUBDIRS += test utils
 
 KCONFIG_FILES = $(shell find $(SND_TOPDIR) -name Kconfig) $(shell find $(SND_TOPDIR)/alsa-kernel/ -name Kconfig)
diff --git a/configure.in b/configure.in
index e586e494b..c207765b6 100644
--- a/configure.in
+++ b/configure.in
@@ -3605,6 +3605,10 @@ else
 fi
 AC_SUBST(CONFIG_HAS_DMA)
 
+dnl Check for FireWire support
+CHECK_KERNEL_CONFIG(CONFIG_FIREWIRE, [FireWire support])
+AC_SUBST(CONFIG_FIREWIRE)
+
 dnl Check for which cards to compile driver for...
 CONFIG_SOUND=m
 ALSA_TOPLEVEL_SELECT
diff --git a/firewire/Makefile b/firewire/Makefile
new file mode 100644
index 000000000..b12062b34
--- /dev/null
+++ b/firewire/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/Makefile
+
+EXTRA_CFLAGS += -I$(SND_TOPDIR)/alsa-kernel/firewire
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/firewire/amdtp.c b/firewire/amdtp.c
new file mode 100644
index 000000000..1aeb3b470
--- /dev/null
+++ b/firewire/amdtp.c
@@ -0,0 +1,3 @@
+#define __NO_VERSION__
+#include "adriver.h"
+#include "../alsa-kernel/firewire/amdtp.c"
diff --git a/firewire/cmp.c b/firewire/cmp.c
new file mode 100644
index 000000000..67bbe7fa8
--- /dev/null
+++ b/firewire/cmp.c
@@ -0,0 +1,3 @@
+#define __NO_VERSION__
+#include "adriver.h"
+#include "../alsa-kernel/firewire/cmp.c"
diff --git a/firewire/fcp.c b/firewire/fcp.c
new file mode 100644
index 000000000..a39149e71
--- /dev/null
+++ b/firewire/fcp.c
@@ -0,0 +1,3 @@
+#define __NO_VERSION__
+#include "adriver.h"
+#include "../alsa-kernel/firewire/fcp.c"
diff --git a/firewire/iso-resources.c b/firewire/iso-resources.c
new file mode 100644
index 000000000..e3c9e1c15
--- /dev/null
+++ b/firewire/iso-resources.c
@@ -0,0 +1,3 @@
+#define __NO_VERSION__
+#include "adriver.h"
+#include "../alsa-kernel/firewire/iso-resources.c"
diff --git a/firewire/lib.c b/firewire/lib.c
new file mode 100644
index 000000000..f49065170
--- /dev/null
+++ b/firewire/lib.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../alsa-kernel/firewire/lib.c"
diff --git a/firewire/packets-buffer.c b/firewire/packets-buffer.c
new file mode 100644
index 000000000..841c032e1
--- /dev/null
+++ b/firewire/packets-buffer.c
@@ -0,0 +1,3 @@
+#define __NO_VERSION__
+#include "adriver.h"
+#include "../alsa-kernel/firewire/packets-buffer.c"
diff --git a/firewire/speakers.c b/firewire/speakers.c
new file mode 100644
index 000000000..ff6a9f5a5
--- /dev/null
+++ b/firewire/speakers.c
@@ -0,0 +1,3 @@
+#include "adriver.h"
+#include "../alsa-kernel/firewire/speakers.c"
+EXPORT_NO_SYMBOLS;
diff --git a/kconfig-vers b/kconfig-vers
index 2136a9ee4..e84911b16 100644
--- a/kconfig-vers
+++ b/kconfig-vers
@@ -26,3 +26,4 @@ SND_ES1968_INPUT 2.6.23
 SND_MAESTRO3_INPUT 2.6.23
 SND_VIRTUOSO	2.6
 SND_USB_6FIRE	2.6.28
+SND_FIREWIRE_SPEAKERS	2.6.39
diff --git a/utils/mod-deps.c b/utils/mod-deps.c
index cd7f92d60..754d12b00 100644
--- a/utils/mod-deps.c
+++ b/utils/mod-deps.c
@@ -122,6 +122,7 @@ static char *kernel_deps[] = {
 	"PCMCIA",
 	"SPI",
 	"I2C*",
+	"FIREWIRE",
 	/* architectures */
 	"ARM*",
 	"PARISC",
@@ -217,6 +218,7 @@ static char *no_cards[] = {
 	"#SND_SUPERH",
 	"#SND_SPARC",
 	"#SND_SPI",
+	"#SND_FIREWIRE",
 	NULL
 };