From a57158f46b05ec94a3ffa02299d5b2714a2caefd Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Sun, 13 Nov 2005 16:07:59 -0800
Subject: [PATCH] --- yaml --- r: 14103 b: refs/heads/master c:
 714a095abfa22dfe2accf641118a65796e966a98 h: refs/heads/master i:   14101:
 d4cc8bfc17110ace450dda8bccdec78a42eddf93   14099:
 ce7e7a1052f9a8ae3a347b76406571835fa0c589   14095:
 eb3eeae4dda49f1562a590243100e52f438ecfdc v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/Kconfig          | 7 +++++++
 trunk/drivers/media/video/Makefile         | 2 ++
 trunk/drivers/media/video/cx25840/Makefile | 6 ++++++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 trunk/drivers/media/video/cx25840/Makefile

diff --git a/[refs] b/[refs]
index 0a3b5927c921..be95897ee92b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70146cfc84dca917ac27cdc754deae63c1282844
+refs/heads/master: 714a095abfa22dfe2accf641118a65796e966a98
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index b893a200fc8a..1a3b3c7e5e99 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/trunk/drivers/media/video/Kconfig
@@ -340,4 +340,11 @@ config VIDEO_AUDIO_DECODER
 	  Say Y here to compile drivers for WM8775 and CS53L32A audio
 	  decoders.
 
+config VIDEO_DECODER
+	tristate "Add support for additional video chipsets"
+	depends on VIDEO_DEV && I2C && EXPERIMENTAL
+	---help---
+	  Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
+	  video  decoders.
+
 endmenu
diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
index 82025968d022..1b3dd86fa6bf 100644
--- a/trunk/drivers/media/video/Makefile
+++ b/trunk/drivers/media/video/Makefile
@@ -56,4 +56,6 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
 
 obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
 
+obj-$(CONFIG_VIDEO_DECODER)     += saa7115.o cx25840/ saa7127.o
+
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
diff --git a/trunk/drivers/media/video/cx25840/Makefile b/trunk/drivers/media/video/cx25840/Makefile
new file mode 100644
index 000000000000..543ebacdc9d7
--- /dev/null
+++ b/trunk/drivers/media/video/cx25840/Makefile
@@ -0,0 +1,6 @@
+cx25840-objs    := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
+		   cx25840-vbi.o
+
+obj-$(CONFIG_VIDEO_DECODER) += cx25840.o
+
+EXTRA_CFLAGS += -I$(src)/..