V4L/DVB (4405): Add missing KConfig I2C dependencies

This was breaking the build if i2c was not previously set

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 5cf96c2e605a126ec836f7be3c6cd47d942784b0..4a56ffb8a9a84656a960f5299cf13564ad7a2cc2 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -1,48 +1,66 @@
 menu "Customise DVB Frontends"
        depends on DVB_CORE
 
+config DVB_FE_CUSTOMISE
+       bool "Customise the frontend modules to build"
+       default N
+       help
+         This allows the user to deselect frontend drivers unnecessary
+         for their hardware from the build. Use this option with care
+         as deselecting frontends which are in fact necessary will result
+         in DVB devices which cannot be tuned due to lack of driver support.
+
+         If unsure say N.
+
 comment "DVB-S (satellite) frontends"
        depends on DVB_CORE
 
 config DVB_STV0299
        tristate "ST STV0299 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
 
@@ -58,7 +76,8 @@ comment "DVB-T (terrestrial) frontends"
 
 config DVB_SP8870
        tristate "Spase sp8870 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
          A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -70,7 +89,8 @@ config DVB_SP8870
 
 config DVB_SP887X
        tristate "Spase sp887x based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
          A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -82,25 +102,29 @@ config DVB_SP887X
 
 config DVB_CX22700
        tristate "Conexant CX22700 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
          A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -113,32 +137,37 @@ config DVB_TDA1004X
 
 config DVB_NXT6000
        tristate "NxtWave Communications NXT6000 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        help
          A DVB-T tuner module. Designed for mobile usage. Say Y when you want
          to support this frontend.
 
 config DVB_DIB3000MC
        tristate "DiBcom 3000P/M-C"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        help
          A DVB-T tuner module. Designed for mobile usage. Say Y when you want
          to support this frontend.
@@ -148,19 +177,22 @@ comment "DVB-C (cable) frontends"
 
 config DVB_VES1820
        tristate "VLSI VES1820 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       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 && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        help
          A DVB-C tuner module. Say Y when you want to support this frontend.
 
@@ -169,7 +201,8 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
 
 config DVB_NXT200X
        tristate "NxtWave Communications NXT2002/NXT2004 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@@ -183,7 +216,8 @@ config DVB_NXT200X
 
 config DVB_OR51211
        tristate "Oren OR51211 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
          An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
@@ -195,7 +229,8 @@ config DVB_OR51211
 
 config DVB_OR51132
        tristate "Oren OR51132 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@@ -210,7 +245,8 @@ config DVB_OR51132
 
 config DVB_BCM3510
        tristate "Broadcom BCM3510"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
          An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to
@@ -218,7 +254,8 @@ config DVB_BCM3510
 
 config DVB_LGDT330X
        tristate "LG Electronics LGDT3302/LGDT3303 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        help
          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
          to support this frontend.
@@ -242,13 +279,15 @@ config DVB_PLL
 
 config DVB_LNBP21
        tristate "LNBP21 SEC controller"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        help
          An SEC control chip.
 
 config DVB_ISL6421
        tristate "ISL6421 SEC controller"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE
+       default m if DVB_FE_CUSTOMISE
        help
          An SEC control chip.
 

diff --git a/drivers/media/dvb/ttusb-budget/Kconfig b/drivers/media/dvb/ttusb-budget/Kconfig
index 46a6a60d2ab9b9751ff2b9262bbe045866b0baa5..ce0fb8f54877a234af68045dd31f55a8866c2ffa 100644 (file)
--- a/drivers/media/dvb/ttusb-budget/Kconfig
+++ b/drivers/media/dvb/ttusb-budget/Kconfig
@@ -1,14 +1,13 @@
 config DVB_TTUSB_BUDGET
        tristate "Technotrend/Hauppauge Nova-USB devices"
-       depends on DVB_CORE && USB && I2C
-       select DVB_PLL
-       select DVB_CX22700
-       select DVB_TDA1004X
-       select DVB_VES1820
-       select DVB_TDA8083
-       select DVB_STV0299
-       select DVB_STV0297
-       select DVB_LNBP21
+       depends on DVB_CORE && USB
+       select DVB_CX22700 if !DVB_FE_CUSTOMISE
+       select DVB_TDA1004X if !DVB_FE_CUSTOMISE
+       select DVB_VES1820 if !DVB_FE_CUSTOMISE
+       select DVB_TDA8083 if !DVB_FE_CUSTOMISE
+       select DVB_STV0299 if !DVB_FE_CUSTOMISE
+       select DVB_STV0297 if !DVB_FE_CUSTOMISE
+       select DVB_LNBP21 if !DVB_FE_CUSTOMISE
        help
          Support for external USB adapters designed by Technotrend and
          produced by Hauppauge, shipped under the brand name 'Nova-USB'.