From a200c664ab4c3da4631781d84afadf411f6acd07 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Fri, 1 Sep 2006 09:25:30 -0300
Subject: [PATCH] --- yaml --- r: 37420 b: refs/heads/master c:
 897ea1307b40a17cb2d6b8d458eaa1573bf1a45e h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/video/Kconfig       | 28 +++++++++++++++++++++++++
 trunk/drivers/media/video/Makefile      |  5 ++++-
 trunk/drivers/media/video/bt8xx/Kconfig |  3 +++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 439fd5a43321..27558e0f0236 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f70a7a918adeebe6be4a72742bff9399210c7541
+refs/heads/master: 897ea1307b40a17cb2d6b8d458eaa1573bf1a45e
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index 272b0e0daf2a..82ca9ab75aa8 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/trunk/drivers/media/video/Kconfig
@@ -338,6 +338,34 @@ config VIDEO_M32R_AR_M64278
 menu "Encoders and Decoders"
 	depends on VIDEO_DEV
 
+config VIDEO_TVAUDIO
+	tristate "Support for several audio decoder chips found on bt8xx boards"
+	depends on VIDEO_DEV && I2C
+	---help---
+	  Support for several audio decoder chips found on some bt8xx boards:
+		tda8425, tea6300, tea6420, tea9840, tda985x, tda9874, pic16c54.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called tvaudio.
+
+config VIDEO_TDA7432
+	tristate "Support for tda7432 chip"
+	depends on VIDEO_DEV && I2C
+	---help---
+	  Support for tda7432 audio decoder chip found on some bt8xx boards.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called tda7432.
+
+config VIDEO_TDA9875
+	tristate "Support for tda9875 chip"
+	depends on VIDEO_DEV && I2C
+	---help---
+	  Support for tda9875 audio decoder chip found on some bt8xx boards.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called tda9875.
+
 config VIDEO_MSP3400
 	tristate "Micronas MSP34xx audio decoders"
 	depends on VIDEO_DEV && I2C
diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
index 231f62b5715c..d2753d10745d 100644
--- a/trunk/drivers/media/video/Makefile
+++ b/trunk/drivers/media/video/Makefile
@@ -17,7 +17,10 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
 endif
 
 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
-obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o
+obj-$(CONFIG_VIDEO_BT848) += ir-kbd-i2c.o
+obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
+obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
+obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o
 obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
 obj-$(CONFIG_VIDEO_ZR36120) += zoran.o
diff --git a/trunk/drivers/media/video/bt8xx/Kconfig b/trunk/drivers/media/video/bt8xx/Kconfig
index cdcf55650714..7eb83d9f6cd9 100644
--- a/trunk/drivers/media/video/bt8xx/Kconfig
+++ b/trunk/drivers/media/video/bt8xx/Kconfig
@@ -9,6 +9,9 @@ config VIDEO_BT848
 	select VIDEO_TUNER
 	select VIDEO_TVEEPROM
 	select VIDEO_MSP3400
+	select VIDEO_TVAUDIO
+	select VIDEO_TDA7432
+	select VIDEO_TDA9875
 	---help---
 	  Support for BT848 based frame grabber/overlay boards. This includes
 	  the Miro, Hauppauge and STB boards. Please read the material in