Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / staging / go7007 / Kconfig

diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig
index 57a121c338c44c61d0874a689802398afbedf65f..f2cf7f66ae0550ee93629032914ef7ea564f9a68 100644 (file)
--- a/drivers/staging/go7007/Kconfig
+++ b/drivers/staging/go7007/Kconfig
@@ -1,10 +1,12 @@
 config VIDEO_GO7007
        tristate "Go 7007 support"
        depends on VIDEO_DEV && PCI && I2C && INPUT
+       depends on SND
        select VIDEOBUF_DMA_SG
        select VIDEO_IR
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
+       select SND_PCM
        select CRC32
        default N
        ---help---
@@ -23,3 +25,13 @@ config VIDEO_GO7007_USB
          To compile this driver as a module, choose M here: the
          module will be called go7007-usb
 
+config VIDEO_GO7007_USB_S2250_BOARD
+       tristate "Sensoray 2250/2251 support"
+       depends on VIDEO_GO7007_USB && DVB_USB
+       default N
+       ---help---
+         This is a video4linux driver for the Sensoray 2250/2251 device
+
+         To compile this driver as a module, choose M here: the
+         module will be called s2250-board
+