aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-05-14 03:57:36 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-14 01:56:47 -0400
commit2ea336dc117098ef917ca9a19e911d15490587cc (patch)
tree90d88eb689d1fde9627af885cde43c2fb1cda855 /drivers/media
parent039d40019f3c5e26ea50ec5af4270189f63365e1 (diff)
V4L/DVB (7899): Fixes a few remaining Kbuild issues at common/tuners
- MEDIA_ATTACH now applies also for V4L; - select a FW_LOADER dependent driver should happen only if HOTPLUG; - apply the common tuner dependency to all tuners. This helps to avoid latter issues. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/tuners/Kconfig20
1 files changed, 17 insertions, 3 deletions
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 394cb050bc77..d6206540476b 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -1,6 +1,6 @@
1config MEDIA_ATTACH 1config MEDIA_ATTACH
2 bool "Load and attach frontend and tuner driver modules as needed" 2 bool "Load and attach frontend and tuner driver modules as needed"
3 depends on DVB_CORE 3 depends on VIDEO_MEDIA
4 depends on MODULES 4 depends on MODULES
5 help 5 help
6 Remove the static dependency of DVB card drivers on all 6 Remove the static dependency of DVB card drivers on all
@@ -22,7 +22,7 @@ config MEDIA_TUNER
22 default VIDEO_MEDIA && I2C 22 default VIDEO_MEDIA && I2C
23 depends on VIDEO_MEDIA && I2C 23 depends on VIDEO_MEDIA && I2C
24 select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG 24 select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
25 select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE 25 select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
26 select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE 26 select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE
27 select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE 27 select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
28 select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE 28 select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE
@@ -46,6 +46,7 @@ if MEDIA_TUNER_CUSTOMIZE
46 46
47config MEDIA_TUNER_SIMPLE 47config MEDIA_TUNER_SIMPLE
48 tristate "Simple tuner support" 48 tristate "Simple tuner support"
49 depends on VIDEO_MEDIA && I2C
49 select MEDIA_TUNER_TDA9887 50 select MEDIA_TUNER_TDA9887
50 default m if MEDIA_TUNER_CUSTOMIZE 51 default m if MEDIA_TUNER_CUSTOMIZE
51 help 52 help
@@ -53,6 +54,7 @@ config MEDIA_TUNER_SIMPLE
53 54
54config MEDIA_TUNER_TDA8290 55config MEDIA_TUNER_TDA8290
55 tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo" 56 tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo"
57 depends on VIDEO_MEDIA && I2C
56 select MEDIA_TUNER_TDA827X 58 select MEDIA_TUNER_TDA827X
57 select MEDIA_TUNER_TDA18271 59 select MEDIA_TUNER_TDA18271
58 default m if MEDIA_TUNER_CUSTOMIZE 60 default m if MEDIA_TUNER_CUSTOMIZE
@@ -61,18 +63,21 @@ config MEDIA_TUNER_TDA8290
61 63
62config MEDIA_TUNER_TDA827X 64config MEDIA_TUNER_TDA827X
63 tristate "Philips TDA827X silicon tuner" 65 tristate "Philips TDA827X silicon tuner"
66 depends on VIDEO_MEDIA && I2C
64 default m if DVB_FE_CUSTOMISE 67 default m if DVB_FE_CUSTOMISE
65 help 68 help
66 A DVB-T silicon tuner module. Say Y when you want to support this tuner. 69 A DVB-T silicon tuner module. Say Y when you want to support this tuner.
67 70
68config MEDIA_TUNER_TDA18271 71config MEDIA_TUNER_TDA18271
69 tristate "NXP TDA18271 silicon tuner" 72 tristate "NXP TDA18271 silicon tuner"
73 depends on VIDEO_MEDIA && I2C
70 default m if DVB_FE_CUSTOMISE 74 default m if DVB_FE_CUSTOMISE
71 help 75 help
72 A silicon tuner module. Say Y when you want to support this tuner. 76 A silicon tuner module. Say Y when you want to support this tuner.
73 77
74config MEDIA_TUNER_TDA9887 78config MEDIA_TUNER_TDA9887
75 tristate "TDA 9885/6/7 analog IF demodulator" 79 tristate "TDA 9885/6/7 analog IF demodulator"
80 depends on VIDEO_MEDIA && I2C
76 default m if MEDIA_TUNER_CUSTOMIZE 81 default m if MEDIA_TUNER_CUSTOMIZE
77 help 82 help
78 Say Y here to include support for Philips TDA9885/6/7 83 Say Y here to include support for Philips TDA9885/6/7
@@ -80,6 +85,7 @@ config MEDIA_TUNER_TDA9887
80 85
81config MEDIA_TUNER_TEA5761 86config MEDIA_TUNER_TEA5761
82 tristate "TEA 5761 radio tuner (EXPERIMENTAL)" 87 tristate "TEA 5761 radio tuner (EXPERIMENTAL)"
88 depends on VIDEO_MEDIA && I2C
83 depends on EXPERIMENTAL 89 depends on EXPERIMENTAL
84 default m if MEDIA_TUNER_CUSTOMIZE 90 default m if MEDIA_TUNER_CUSTOMIZE
85 help 91 help
@@ -87,42 +93,49 @@ config MEDIA_TUNER_TEA5761
87 93
88config MEDIA_TUNER_TEA5767 94config MEDIA_TUNER_TEA5767
89 tristate "TEA 5767 radio tuner" 95 tristate "TEA 5767 radio tuner"
96 depends on VIDEO_MEDIA && I2C
90 default m if MEDIA_TUNER_CUSTOMIZE 97 default m if MEDIA_TUNER_CUSTOMIZE
91 help 98 help
92 Say Y here to include support for the Philips TEA5767 radio tuner. 99 Say Y here to include support for the Philips TEA5767 radio tuner.
93 100
94config MEDIA_TUNER_MT20XX 101config MEDIA_TUNER_MT20XX
95 tristate "Microtune 2032 / 2050 tuners" 102 tristate "Microtune 2032 / 2050 tuners"
103 depends on VIDEO_MEDIA && I2C
96 default m if MEDIA_TUNER_CUSTOMIZE 104 default m if MEDIA_TUNER_CUSTOMIZE
97 help 105 help
98 Say Y here to include support for the MT2032 / MT2050 tuner. 106 Say Y here to include support for the MT2032 / MT2050 tuner.
99 107
100config MEDIA_TUNER_MT2060 108config MEDIA_TUNER_MT2060
101 tristate "Microtune MT2060 silicon IF tuner" 109 tristate "Microtune MT2060 silicon IF tuner"
110 depends on VIDEO_MEDIA && I2C
102 default m if DVB_FE_CUSTOMISE 111 default m if DVB_FE_CUSTOMISE
103 help 112 help
104 A driver for the silicon IF tuner MT2060 from Microtune. 113 A driver for the silicon IF tuner MT2060 from Microtune.
105 114
106config MEDIA_TUNER_MT2266 115config MEDIA_TUNER_MT2266
107 tristate "Microtune MT2266 silicon tuner" 116 tristate "Microtune MT2266 silicon tuner"
117 depends on VIDEO_MEDIA && I2C
108 default m if DVB_FE_CUSTOMISE 118 default m if DVB_FE_CUSTOMISE
109 help 119 help
110 A driver for the silicon baseband tuner MT2266 from Microtune. 120 A driver for the silicon baseband tuner MT2266 from Microtune.
111 121
112config MEDIA_TUNER_MT2131 122config MEDIA_TUNER_MT2131
113 tristate "Microtune MT2131 silicon tuner" 123 tristate "Microtune MT2131 silicon tuner"
124 depends on VIDEO_MEDIA && I2C
114 default m if DVB_FE_CUSTOMISE 125 default m if DVB_FE_CUSTOMISE
115 help 126 help
116 A driver for the silicon baseband tuner MT2131 from Microtune. 127 A driver for the silicon baseband tuner MT2131 from Microtune.
117 128
118config MEDIA_TUNER_QT1010 129config MEDIA_TUNER_QT1010
119 tristate "Quantek QT1010 silicon tuner" 130 tristate "Quantek QT1010 silicon tuner"
131 depends on VIDEO_MEDIA && I2C
120 default m if DVB_FE_CUSTOMISE 132 default m if DVB_FE_CUSTOMISE
121 help 133 help
122 A driver for the silicon tuner QT1010 from Quantek. 134 A driver for the silicon tuner QT1010 from Quantek.
123 135
124config MEDIA_TUNER_XC2028 136config MEDIA_TUNER_XC2028
125 tristate "XCeive xc2028/xc3028 tuners" 137 tristate "XCeive xc2028/xc3028 tuners"
138 depends on VIDEO_MEDIA && I2C
126 depends on HOTPLUG 139 depends on HOTPLUG
127 select FW_LOADER 140 select FW_LOADER
128 default m if MEDIA_TUNER_CUSTOMIZE 141 default m if MEDIA_TUNER_CUSTOMIZE
@@ -131,6 +144,7 @@ config MEDIA_TUNER_XC2028
131 144
132config MEDIA_TUNER_XC5000 145config MEDIA_TUNER_XC5000
133 tristate "Xceive XC5000 silicon tuner" 146 tristate "Xceive XC5000 silicon tuner"
147 depends on VIDEO_MEDIA && I2C
134 depends on HOTPLUG 148 depends on HOTPLUG
135 select FW_LOADER 149 select FW_LOADER
136 default m if DVB_FE_CUSTOMISE 150 default m if DVB_FE_CUSTOMISE
@@ -141,7 +155,7 @@ config MEDIA_TUNER_XC5000
141 155
142config MEDIA_TUNER_MXL5005S 156config MEDIA_TUNER_MXL5005S
143 tristate "MaxLinear MSL5005S silicon tuner" 157 tristate "MaxLinear MSL5005S silicon tuner"
144 depends on I2C 158 depends on VIDEO_MEDIA && I2C
145 default m if DVB_FE_CUSTOMISE 159 default m if DVB_FE_CUSTOMISE
146 help 160 help
147 A driver for the silicon tuner MXL5005S from MaxLinear. 161 A driver for the silicon tuner MXL5005S from MaxLinear.