aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-03-16 00:53:14 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-21 11:53:47 -0500
commitac9ec9358e63878b105f48f5f094105dff7d9833 (patch)
tree72abee794d515a1ad4b4a7d511828c195d03c058
parentcfdd4ad0661e57db353ff36c2e8c57fc956cf6fb (diff)
V4L/DVB (3524): Kconfig: add menu items for saa7115 and saa7127
- created Kconfig menu item, VIDEO_SAA711X, for the saa7115 module, which supports SAA7113, SAA7114 and SAA7115 video decoders. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/Kconfig20
-rw-r--r--drivers/media/video/Makefile5
-rw-r--r--drivers/media/video/em28xx/Kconfig1
3 files changed, 24 insertions, 2 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 1a95a0eca7a9..f50033e985e1 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -363,10 +363,30 @@ config VIDEO_DECODER
363 tristate "Add support for additional video chipsets" 363 tristate "Add support for additional video chipsets"
364 depends on VIDEO_DEV && I2C && EXPERIMENTAL 364 depends on VIDEO_DEV && I2C && EXPERIMENTAL
365 select VIDEO_CX25840 365 select VIDEO_CX25840
366 select VIDEO_SAA711X
367 select VIDEO_SAA7127
366 ---help--- 368 ---help---
367 Say Y here to compile drivers for SAA7115, SAA7127 and CX25840 369 Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
368 video decoders. 370 video decoders.
369 371
370source "drivers/media/video/cx25840/Kconfig" 372source "drivers/media/video/cx25840/Kconfig"
371 373
374config VIDEO_SAA711X
375 tristate "Philips SAA7113/4/5 video decoders"
376 depends on VIDEO_DEV && I2C && EXPERIMENTAL
377 ---help---
378 Support for the Philips SAA7113/4/5 video decoders.
379
380 To compile this driver as a module, choose M here: the
381 module will be called saa7115
382
383config VIDEO_SAA7127
384 tristate "Philips SAA7127/9 digital video encoders"
385 depends on VIDEO_DEV && I2C && EXPERIMENTAL
386 ---help---
387 Support for the Philips SAA7127/9 digital video encoders.
388
389 To compile this driver as a module, choose M here: the
390 module will be called saa7127
391
372endmenu 392endmenu
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index e42a25880781..67fc6d6bd81b 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -44,7 +44,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o
44obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/ 44obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/
45obj-$(CONFIG_VIDEO_CX88) += cx88/ 45obj-$(CONFIG_VIDEO_CX88) += cx88/
46obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ 46obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
47obj-$(CONFIG_VIDEO_EM28XX) += saa7115.o tvp5150.o 47obj-$(CONFIG_VIDEO_EM28XX) += tvp5150.o
48obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o 48obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
49obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o 49obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o
50obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ 50obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
@@ -63,7 +63,8 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
63 63
64obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o 64obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
65 65
66obj-$(CONFIG_VIDEO_DECODER) += saa7115.o saa7127.o
67obj-$(CONFIG_VIDEO_CX25840) += cx25840/ 66obj-$(CONFIG_VIDEO_CX25840) += cx25840/
67obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o
68obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
68 69
69EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core 70EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 885fd0170086..5a793ae7cc23 100644
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -5,6 +5,7 @@ config VIDEO_EM28XX
5 select VIDEO_TUNER 5 select VIDEO_TUNER
6 select VIDEO_TVEEPROM 6 select VIDEO_TVEEPROM
7 select VIDEO_IR 7 select VIDEO_IR
8 select VIDEO_SAA711X
8 ---help--- 9 ---help---
9 This is a video4linux driver for Empia 28xx based TV cards. 10 This is a video4linux driver for Empia 28xx based TV cards.
10 11