Merge branch 'fixes' into for-linus

[karo-tx-linux.git] / drivers / media / pci / Kconfig

diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index 3b9164af6ec4acb9c946e0cb00e6b805d18d901b..d4e2ed3f27e5edd45ab63caf69e77c2364e23a43 100644 (file)
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -1,50 +1,47 @@
-#
-# DVB device configuration
-#
-
-menuconfig DVB_CAPTURE_DRIVERS
-       bool "DVB/ATSC adapters"
-       depends on DVB_CORE
-       default y
-       ---help---
-         Say Y to select Digital TV adapters
+menuconfig MEDIA_PCI_SUPPORT
+       bool "Media PCI Adapters"
+       depends on PCI && MEDIA_SUPPORT
+       help
+         Enable media drivers for PCI/PCIe bus.
+         If you have such devices, say Y.
+
+if MEDIA_PCI_SUPPORT
+
+if MEDIA_CAMERA_SUPPORT
+       comment "Media capture support"
+source "drivers/media/pci/meye/Kconfig"
+source "drivers/media/pci/sta2x11/Kconfig"
+endif
+
+if MEDIA_ANALOG_TV_SUPPORT
+       comment "Media capture/analog TV support"
+source "drivers/media/pci/ivtv/Kconfig"
+source "drivers/media/pci/zoran/Kconfig"
+source "drivers/media/pci/saa7146/Kconfig"
+endif
+
+if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
+       comment "Media capture/analog/hybrid TV support"
+source "drivers/media/pci/cx18/Kconfig"
+source "drivers/media/pci/cx23885/Kconfig"
+source "drivers/media/pci/cx25821/Kconfig"
+source "drivers/media/pci/cx88/Kconfig"
+source "drivers/media/pci/bt8xx/Kconfig"
+source "drivers/media/pci/saa7134/Kconfig"
+source "drivers/media/pci/saa7164/Kconfig"
 
-if DVB_CAPTURE_DRIVERS && DVB_CORE
+endif
 
-comment "Supported SAA7146 based PCI Adapters"
-       depends on DVB_CORE && PCI && I2C
+if MEDIA_DIGITAL_TV_SUPPORT
+       comment "Media digital TV PCI Adapters"
 source "drivers/media/pci/ttpci/Kconfig"
-
-comment "Supported FlexCopII (B2C2) Adapters"
-       depends on DVB_CORE && (PCI || USB) && I2C
 source "drivers/media/pci/b2c2/Kconfig"
-
-comment "Supported BT878 Adapters"
-       depends on DVB_CORE && PCI && I2C
-source "drivers/media/pci/bt8xx/Kconfig"
-
-comment "Supported Pluto2 Adapters"
-       depends on DVB_CORE && PCI && I2C
 source "drivers/media/pci/pluto2/Kconfig"
-
-comment "Supported SDMC DM1105 Adapters"
-       depends on DVB_CORE && PCI && I2C
 source "drivers/media/pci/dm1105/Kconfig"
-
-comment "Supported Earthsoft PT1 Adapters"
-       depends on DVB_CORE && PCI && I2C
 source "drivers/media/pci/pt1/Kconfig"
+source "drivers/media/pci/mantis/Kconfig"
+source "drivers/media/pci/ngene/Kconfig"
+source "drivers/media/pci/ddbridge/Kconfig"
+endif
 
-comment "Supported Mantis Adapters"
-       depends on DVB_CORE && PCI && I2C
-       source "drivers/media/pci/mantis/Kconfig"
-
-comment "Supported nGene Adapters"
-       depends on DVB_CORE && PCI && I2C
-       source "drivers/media/pci/ngene/Kconfig"
-
-comment "Supported ddbridge ('Octopus') Adapters"
-       depends on DVB_CORE && PCI && I2C
-       source "drivers/media/pci/ddbridge/Kconfig"
-
-endif # DVB_CAPTURE_DRIVERS
+endif #MEDIA_PCI_SUPPORT