5 files changed, 57 insertions, 49 deletions

diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index 49a06fc54c51..a0dcd59da76e 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -2,13 +2,13 @@ config DVB_B2C2_FLEXCOP
         tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
         depends on DVB_CORE && I2C
         select DVB_PLL
-        select DVB_STV0299
-        select DVB_MT352
-        select DVB_MT312
-        select DVB_NXT200X
-        select DVB_STV0297
-        select DVB_BCM3510
-        select DVB_LGDT330X
+        select DVB_STV0299 if !DVB_FE_CUSTOMISE
+        select DVB_MT352 if !DVB_FE_CUSTOMISE
+        select DVB_MT312 if !DVB_FE_CUSTOMISE
+        select DVB_NXT200X if !DVB_FE_CUSTOMISE
+        select DVB_STV0297 if !DVB_FE_CUSTOMISE
+        select DVB_BCM3510 if !DVB_FE_CUSTOMISE
+        select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         help
           Support for the digital TV receiver chip made by B2C2 Inc. included in
           Technisats PCI cards and USB boxes.
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index 7d0ee1ab2903..ae2ff5dc238d 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -2,13 +2,13 @@ config DVB_BT8XX
         tristate "BT8xx based PCI cards"
         depends on DVB_CORE && PCI && I2C && VIDEO_BT848
         select DVB_PLL
-        select DVB_MT352
-        select DVB_SP887X
-        select DVB_NXT6000
-        select DVB_CX24110
-        select DVB_OR51211
-        select DVB_LGDT330X
-        select DVB_ZL10353
+        select DVB_MT352 if !DVB_FE_CUSTOMISE
+        select DVB_SP887X if !DVB_FE_CUSTOMISE
+        select DVB_NXT6000 if !DVB_FE_CUSTOMISE
+        select DVB_CX24110 if !DVB_FE_CUSTOMISE
+        select DVB_OR51211 if !DVB_FE_CUSTOMISE
+        select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select FW_LOADER
         help
           Support for PCI cards based on the Bt8xx PCI bridge. Examples are
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 4a56ffb8a9a8..63e8e7e2a1f3 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -17,56 +17,56 @@ comment "DVB-S (satellite) frontends"
 
 config DVB_STV0299
         tristate "ST STV0299 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_CX24110
         tristate "Conexant CX24110 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_CX24123
         tristate "Conexant CX24123 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_TDA8083
         tristate "Philips TDA8083 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT312
         tristate "Zarlink VP310/MT312 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_VES1X93
         tristate "VLSI VES1893 or VES1993 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_S5H1420
         tristate "Samsung S5H1420 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_TDA10086
         tristate "Philips TDA10086 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
@@ -76,7 +76,7 @@ comment "DVB-T (terrestrial) frontends"
 
 config DVB_SP8870
         tristate "Spase sp8870 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -89,7 +89,7 @@ config DVB_SP8870
 
 config DVB_SP887X
         tristate "Spase sp887x based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -102,28 +102,28 @@ config DVB_SP887X
 
 config DVB_CX22700
         tristate "Conexant CX22700 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_CX22702
         tristate "Conexant cx22702 demodulator (OFDM)"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_L64781
         tristate "LSI L64781"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_TDA1004X
         tristate "Philips TDA10045H/TDA10046H based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -137,28 +137,28 @@ config DVB_TDA1004X
 
 config DVB_NXT6000
         tristate "NxtWave Communications NXT6000 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT352
         tristate "Zarlink MT352 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_ZL10353
         tristate "Zarlink ZL10353 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_DIB3000MB
         tristate "DiBcom 3000M-B"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T tuner module. Designed for mobile usage. Say Y when you want
@@ -166,7 +166,7 @@ config DVB_DIB3000MB
 
 config DVB_DIB3000MC
         tristate "DiBcom 3000P/M-C"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T tuner module. Designed for mobile usage. Say Y when you want
@@ -177,21 +177,21 @@ comment "DVB-C (cable) frontends"
 
 config DVB_VES1820
         tristate "VLSI VES1820 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-C tuner module. Say Y when you want to support this frontend.
 
 config DVB_TDA10021
         tristate "Philips TDA10021 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-C tuner module. Say Y when you want to support this frontend.
 
 config DVB_STV0297
         tristate "ST STV0297 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-C tuner module. Say Y when you want to support this frontend.
@@ -201,7 +201,7 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
 
 config DVB_NXT200X
         tristate "NxtWave Communications NXT2002/NXT2004 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -216,7 +216,7 @@ config DVB_NXT200X
 
 config DVB_OR51211
         tristate "Oren OR51211 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -229,7 +229,7 @@ config DVB_OR51211
 
 config DVB_OR51132
         tristate "Oren OR51132 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -245,7 +245,7 @@ config DVB_OR51132
 
 config DVB_BCM3510
         tristate "Broadcom BCM3510"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -254,7 +254,7 @@ config DVB_BCM3510
 
 config DVB_LGDT330X
         tristate "LG Electronics LGDT3302/LGDT3303 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@@ -263,9 +263,13 @@ config DVB_LGDT330X
 comment "Tuners/PLL support"
         depends on DVB_CORE
 
+config DVB_PLL
+        tristate
+        depends on DVB_CORE && I2C
+
 config DVB_TDA826X
         tristate "Philips TDA826X silicon tuner"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-S silicon tuner module. Say Y when you want to support this tuner.
@@ -273,20 +277,16 @@ config DVB_TDA826X
 comment "Miscellaneous devices"
         depends on DVB_CORE
 
-config DVB_PLL
-        tristate
-        depends on DVB_CORE && I2C
-
 config DVB_LNBP21
         tristate "LNBP21 SEC controller"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           An SEC control chip.
 
 config DVB_ISL6421
         tristate "ISL6421 SEC controller"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           An SEC control chip.
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 0f01b9ff1727..9ce932e97f23 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -3,6 +3,7 @@ config DVB_AV7110
         depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
         select FW_LOADER
         select VIDEO_SAA7146_VV
+        select DVB_PLL
         select DVB_VES1820 if !DVB_FE_CUSTOMISE
         select DVB_VES1X93 if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
@@ -61,6 +62,7 @@ config DVB_BUDGET
         tristate "Budget cards"
         depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
         select VIDEO_SAA7146
+        select DVB_PLL
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_VES1X93 if !DVB_FE_CUSTOMISE
         select DVB_VES1820 if !DVB_FE_CUSTOMISE
@@ -68,6 +70,8 @@ config DVB_BUDGET
         select DVB_TDA8083 if !DVB_FE_CUSTOMISE
         select DVB_TDA10021 if !DVB_FE_CUSTOMISE
         select DVB_S5H1420 if !DVB_FE_CUSTOMISE
+        select DVB_TDA10086 if !DVB_FE_CUSTOMISE
+        select DVB_TDA826X if !DVB_FE_CUSTOMISE
         select DVB_LNBP21 if !DVB_FE_CUSTOMISE
         help
           Support for simple SAA7146 based DVB cards
@@ -83,6 +87,7 @@ config DVB_BUDGET_CI
         tristate "Budget cards with onboard CI connector"
         depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
         select VIDEO_SAA7146
+        select DVB_PLL
         select DVB_STV0297 if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
@@ -104,6 +109,7 @@ config DVB_BUDGET_AV
         tristate "Budget cards with analog video inputs"
         depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
         select VIDEO_SAA7146_VV
+        select DVB_PLL
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select DVB_TDA10021 if !DVB_FE_CUSTOMISE
@@ -122,6 +128,7 @@ config DVB_BUDGET_PATCH
         tristate "AV7110 cards with Budget Patch"
         depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
         select DVB_AV7110
+        select DVB_PLL
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_VES1X93 if !DVB_FE_CUSTOMISE
         select DVB_TDA8083 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/dvb/ttusb-budget/Kconfig b/drivers/media/dvb/ttusb-budget/Kconfig
index ce0fb8f54877..e78ea9227b0e 100644
--- a/drivers/media/dvb/ttusb-budget/Kconfig
+++ b/drivers/media/dvb/ttusb-budget/Kconfig
@@ -1,6 +1,7 @@
 config DVB_TTUSB_BUDGET
         tristate "Technotrend/Hauppauge Nova-USB devices"
-        depends on DVB_CORE && USB
+        depends on DVB_CORE && USB && I2C
+        select DVB_PLL
         select DVB_CX22700 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select DVB_VES1820 if !DVB_FE_CUSTOMISE