]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/media/Kconfig
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-omap-h63xx.git] / drivers / media / Kconfig
index 9f7e1fe8c97e254ee107bbf771550223d6219557..d9d033e07e197cb0496218fc3f334bc1b33f06cf 100644 (file)
@@ -3,6 +3,7 @@
 #
 
 menu "Multimedia devices"
+       depends on HAS_IOMEM
 
 config VIDEO_DEV
        tristate "Video For Linux"
@@ -67,8 +68,10 @@ source "drivers/media/common/Kconfig"
 
 config VIDEO_TUNER
        tristate
+       depends on I2C
 
 config VIDEO_BUF
+       depends on PCI
        tristate
 
 config VIDEO_BUF_DVB
@@ -77,12 +80,25 @@ config VIDEO_BUF_DVB
 config VIDEO_BTCX
        tristate
 
+config VIDEO_IR_I2C
+       tristate
+
 config VIDEO_IR
        tristate
+       select VIDEO_IR_I2C if I2C
 
 config VIDEO_TVEEPROM
        tristate
+       depends on I2C
+
+config DAB
+       boolean "DAB adapters"
+       default y
+       ---help---
+         Allow selecting support for for Digital Audio Broadcasting (DAB)
+         Receiver adapters.
 
+if DAB
 config USB_DABUSB
        tristate "DABUSB driver"
        depends on USB
@@ -96,5 +112,6 @@ config USB_DABUSB
 
          To compile this driver as a module, choose M here: the
          module will be called dabusb.
+endif # DAB
 
 endmenu