Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

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

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 87410dbd3df41829d36bd49e37af91272718eef5..d9d033e07e197cb0496218fc3f334bc1b33f06cf 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Multimedia devices"
+       depends on HAS_IOMEM
 
 config VIDEO_DEV
        tristate "Video For Linux"
@@ -70,6 +71,7 @@ config VIDEO_TUNER
        depends on I2C
 
 config VIDEO_BUF
+       depends on PCI
        tristate
 
 config VIDEO_BUF_DVB
@@ -78,13 +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
@@ -98,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