From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Mon, 14 Nov 2005 00:07:59 +0000 (-0800)
Subject: [PATCH] v4l: (950) Added compiler options for cx25840 saa7115 and saa7127
X-Git-Tag: v2.6.15-rc2~130
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=714a095abfa22dfe2accf641118a65796e966a98;p=linux-2.6

[PATCH] v4l: (950) Added compiler options for cx25840 saa7115 and saa7127

Added compiler options for cx25840, saa7115 and saa7127

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index b893a200fc..1a3b3c7e5e 100644
--- a/drivers/media/video/Kconfig
+++ b/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/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 82025968d0..1b3dd86fa6 100644
--- a/drivers/media/video/Makefile
+++ b/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/drivers/media/video/cx25840/Makefile b/drivers/media/video/cx25840/Makefile
new file mode 100644
index 0000000000..543ebacdc9
--- /dev/null
+++ b/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)/..