Merge branches 'release' and 'gpe-ack' into release

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

diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index efd2b746815820e06698a209881e1d53c35d4cc8..03ef88acd9b826bbafc60ccad5a12be6e0302ceb 100644 (file)
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -11,7 +11,7 @@ menuconfig DVB_CAPTURE_DRIVERS
        ---help---
          Say Y to select Digital TV adapters
 
-if DVB_CAPTURE_DRIVERS
+if DVB_CAPTURE_DRIVERS && DVB_CORE
 
 comment "Supported SAA7146 based PCI Adapters"
        depends on DVB_CORE && PCI && I2C