Allow compilation of the audio drivers

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Now, make will compile also the audio drivers at the tree.
By default, they will not be installed. A new option were
added to install those files:
	make sound-install

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

7 files changed, 90 insertions, 0 deletions

diff --git a/INSTALL b/INSTALL
index 94823d422..0a0647bb5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,6 +31,11 @@ default		- Continues building the latest module selection
 install		- Installs all modules at kernel's default dir
 		  for V4L/DVB. Requires root access.
 
+rminstall	- cleans previous installations of V4L/DVB modules
+
+sound-install	- installs the sound modules related to V4L/DVB
+		  tree.
+
 =======================
 Module selection rules:
 (Those may require write access to kernel tree)
diff --git a/linux/include/sound/tea575x-tuner.h b/linux/include/sound/tea575x-tuner.h
new file mode 100644
index 000000000..aca07adb5
--- /dev/null
+++ b/linux/include/sound/tea575x-tuner.h
@@ -0,0 +1,53 @@
+#ifndef __SOUND_TEA575X_TUNER_H
+#define __SOUND_TEA575X_TUNER_H
+
+/*
+ *   ALSA driver for TEA5757/5759 Philips AM/FM tuner chips
+ *
+ *	Copyright (c) 2004 Jaroslav Kysela <perex@suse.cz>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include "compat.h"
+#include <linux/videodev.h>
+#include <media/v4l2-dev.h>
+
+struct snd_tea575x;
+
+struct snd_tea575x_ops {
+	void (*write)(struct snd_tea575x *tea, unsigned int val);
+	unsigned int (*read)(struct snd_tea575x *tea);
+};
+
+struct snd_tea575x {
+	struct snd_card *card;
+	struct video_device vd;		/* video device */
+	struct file_operations fops;
+	int dev_nr;			/* requested device number + 1 */
+	int vd_registered;		/* video device is registered */
+	int tea5759;			/* 5759 chip is present */
+	unsigned int freq_fixup;	/* crystal onboard */
+	unsigned int val;		/* hw value */
+	unsigned long freq;		/* frequency */
+	struct snd_tea575x_ops *ops;
+	void *private_data;
+};
+
+void snd_tea575x_init(struct snd_tea575x *tea);
+void snd_tea575x_exit(struct snd_tea575x *tea);
+
+#endif /* __SOUND_TEA575X_TUNER_H */
diff --git a/linux/sound/oss/btaudio.c b/linux/sound/oss/btaudio.c
index 1fa72e732..4813cee1d 100644
--- a/linux/sound/oss/btaudio.c
+++ b/linux/sound/oss/btaudio.c
@@ -33,6 +33,7 @@
 #include <linux/slab.h>
 #include <linux/kdev_t.h>
 #include <linux/mutex.h>
+#include "compat.h"
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index 215bc396b..9dd881d73 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -34,6 +34,7 @@
 #include <sound/pcm_params.h>
 #include <sound/control.h>
 #include <sound/initval.h>
+#include "compat.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("Brooktree Bt87x audio driver");
diff --git a/v4l/Makefile b/v4l/Makefile
index 3e9336a95..bed3a0e42 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -39,6 +39,7 @@ default:: config-compat.h Makefile.media links .version
 
 -include $(obj)/.myconfig
 -include $(obj)/Makefile.media
+-include $(obj)/Makefile.sound
 -include $(obj)/Makefile.ivtv
 
 #################################################
@@ -52,6 +53,10 @@ ifeq ($(CONFIG_DVB_FIRESAT),m)
   EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/
 endif
 
+ifeq ($(CONFIG_SOUND_ACI_MIXER),m)
+  EXTRA_CFLAGS += -I$(srctree)/sound/oss/
+endif
+
 EXTRA_CFLAGS += -g
 
 EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
diff --git a/v4l/Makefile.sound b/v4l/Makefile.sound
index 157a75ec4..0f218b78b 100644
--- a/v4l/Makefile.sound
+++ b/v4l/Makefile.sound
@@ -12,3 +12,27 @@ obj-$(CONFIG_SOUND_BT878)       += btaudio.o
 snd-tea575x-tuner-objs := tea575x-tuner.o
 obj-$(CONFIG_SND_FM801_TEA575X) += snd-tea575x-tuner.o
 
+KDIRA          := /lib/modules/$(KERNELRELEASE)/kernel
+
+
+sound-install install-sound::
+	@dir="sound/pci"; \
+        files='snd-bt87x.ko'; \
+        echo -e "\nInstalling $(KDIRA)/$$dir files:"; \
+        install -d $(KDIRA)/$$dir; \
+        for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \
+	install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo;
+
+	@dir="sound/oss"; \
+	files='aci.ko btaudio.ko'; \
+        echo -e "\nInstalling $(KDIRA)/$$dir files:"; \
+        install -d $(KDIRA)/$$dir; \
+	for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \
+	install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo;
+
+	@dir="sound/i2c/other"; \
+	files='snd-tea575x-tuner.ko'; \
+        echo -e "\nInstalling $(KDIRA)/$$dir files:"; \
+        install -d $(KDIRA)/$$dir; \
+	for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \
+	install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo;
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index c44914501..1f286564a 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -377,6 +377,7 @@ config VIDEO_KERNEL_VERSION
 EOF
 
 open_kconfig ("../linux","../linux/drivers/media/Kconfig");
+open_kconfig (".","./Kconfig.sound");
 
 print OUT "source Kconfig.sound\n";
 close OUT;