Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / drivers / media / video / em28xx / Kconfig

diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index c1127802ad9cd3cf1f6f2f7baacf4dc23f25509d..c7c2896bbd8b312823d0abd9898c3ed8ee8e455f 100644 (file)
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,13 +1,41 @@
 config VIDEO_EM28XX
-       tristate "Empia EM2800/2820/2840 USB video capture support"
-       depends on VIDEO_V4L1 && I2C && INPUT
-       select VIDEO_TUNER
+       tristate "Empia EM28xx USB video capture support"
+       depends on VIDEO_DEV && I2C && INPUT
+       select MEDIA_TUNER
        select VIDEO_TVEEPROM
        select VIDEO_IR
+       select VIDEOBUF_VMALLOC
        select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO
+       select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
        ---help---
          This is a video4linux driver for Empia 28xx based TV cards.
 
          To compile this driver as a module, choose M here: the
          module will be called em28xx
+
+config VIDEO_EM28XX_ALSA
+       depends on VIDEO_EM28XX && SND
+       select SND_PCM
+       tristate "Empia EM28xx ALSA audio module"
+       ---help---
+         This is an ALSA driver for some Empia 28xx based TV cards.
+
+         This is not required for em2800/em2820/em2821 boards. However,
+         newer em28xx devices uses Vendor Class for audio, instead of
+         implementing the USB Audio Class. For those chips, this module
+         will enable digital audio.
+
+         To compile this driver as a module, choose M here: the
+         module will be called em28xx-alsa
+
+config VIDEO_EM28XX_DVB
+       tristate "DVB/ATSC Support for em28xx based TV cards"
+       depends on VIDEO_EM28XX && DVB_CORE
+       select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+       select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+       select VIDEOBUF_DVB
+       select FW_LOADER
+       ---help---
+         This adds support for DVB cards based on the
+         Empiatech em28xx chips.