Merge branch 'linus' into x86/pebs

[pandora-kernel.git] / drivers / media / video / em28xx / Kconfig

diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index abbd38c..16a5af3 100644 (file)
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,11 +1,13 @@
 config VIDEO_EM28XX
-       tristate "Empia EM2800/2820/2840 USB video capture support"
+       tristate "Empia EM28xx USB video capture support"
        depends on VIDEO_DEV && I2C && INPUT
        select VIDEO_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.
 
@@ -13,7 +15,8 @@ config VIDEO_EM28XX
          module will be called em28xx
 
 config VIDEO_EM28XX_ALSA
-       depends on VIDEO_EM28XX
+       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.
@@ -26,3 +29,12 @@ config VIDEO_EM28XX_ALSA
          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
+       ---help---
+         This adds support for DVB cards based on the
+         Empiatech em28xx chips.