summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-11-09 03:00:29 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-11-09 03:00:29 +0000
commitd1bf97514d0d973acd720439564cb09ee92a025c (patch)
tree1ee4e5dc5f3d2cfc3b32a6486716bff92e18872d
parentad9ebb76fe74f8b187e538e5ccc761c085c9f0f1 (diff)
downloadmediapointer-dvb-s2-d1bf97514d0d973acd720439564cb09ee92a025c.tar.gz
mediapointer-dvb-s2-d1bf97514d0d973acd720439564cb09ee92a025c.tar.bz2
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>
-rw-r--r--linux/drivers/media/video/Kconfig7
-rw-r--r--linux/drivers/media/video/Makefile3
-rw-r--r--v4l/ChangeLog17
3 files changed, 27 insertions, 0 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index 69ba07daf..c42c0b24a 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/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/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index 82025968d..6bd9ff71e 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -8,6 +8,7 @@ zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o
zr36067-objs := zoran_procfs.o zoran_device.o \
zoran_driver.o zoran_card.o
tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o
+
obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o
obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \
@@ -56,4 +57,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/v4l/ChangeLog b/v4l/ChangeLog
index 0e68a3847..46394322e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,20 @@
+2005-11-09 02:57 mchehab
+
+ * ../linux/drivers/media/video/Kconfig:
+ * ../linux/drivers/media/video/Makefile:
+ * ../linux/drivers/media/video/cx25840/Makefile:
+
+ - Added compiler options for cx25840, saa7115 and saa7127
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
+2005-11-09 02:54 mchehab
+
+ * ../linux/drivers/media/video/Makefile:
+ * ../linux/drivers/media/video/cx25840/Makefile:
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-11-09 02:30 mchehab
* ../linux/drivers/media/video/tda8290.c: (set_audio):