aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-10 01:30:23 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:14 -0400
commit0aab2e6044037c34ccb5fe94c616e532ba95f541 (patch)
tree236347c69c788da360907fcde94d35db2548b827
parent79a6650525755aaa3d30a9b6d8f9bc96788c1262 (diff)
V4L/DVB (10897): Fix Kbuild MEDIA_TUNER_CUSTOMIZE dependencies
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/common/tuners/Kconfig20
-rw-r--r--drivers/media/video/au0828/Kconfig6
-rw-r--r--drivers/media/video/cx23885/Kconfig8
-rw-r--r--drivers/media/video/pvrusb2/Kconfig4
4 files changed, 19 insertions, 19 deletions
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 7969b695cb50..724e6870c412 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -66,14 +66,14 @@ config MEDIA_TUNER_TDA8290
66config MEDIA_TUNER_TDA827X 66config MEDIA_TUNER_TDA827X
67 tristate "Philips TDA827X silicon tuner" 67 tristate "Philips TDA827X silicon tuner"
68 depends on VIDEO_MEDIA && I2C 68 depends on VIDEO_MEDIA && I2C
69 default m if DVB_FE_CUSTOMISE 69 default m if MEDIA_TUNER_CUSTOMIZE
70 help 70 help
71 A DVB-T silicon tuner module. Say Y when you want to support this tuner. 71 A DVB-T silicon tuner module. Say Y when you want to support this tuner.
72 72
73config MEDIA_TUNER_TDA18271 73config MEDIA_TUNER_TDA18271
74 tristate "NXP TDA18271 silicon tuner" 74 tristate "NXP TDA18271 silicon tuner"
75 depends on VIDEO_MEDIA && I2C 75 depends on VIDEO_MEDIA && I2C
76 default m if DVB_FE_CUSTOMISE 76 default m if MEDIA_TUNER_CUSTOMIZE
77 help 77 help
78 A silicon tuner module. Say Y when you want to support this tuner. 78 A silicon tuner module. Say Y when you want to support this tuner.
79 79
@@ -110,28 +110,28 @@ config MEDIA_TUNER_MT20XX
110config MEDIA_TUNER_MT2060 110config MEDIA_TUNER_MT2060
111 tristate "Microtune MT2060 silicon IF tuner" 111 tristate "Microtune MT2060 silicon IF tuner"
112 depends on VIDEO_MEDIA && I2C 112 depends on VIDEO_MEDIA && I2C
113 default m if DVB_FE_CUSTOMISE 113 default m if MEDIA_TUNER_CUSTOMIZE
114 help 114 help
115 A driver for the silicon IF tuner MT2060 from Microtune. 115 A driver for the silicon IF tuner MT2060 from Microtune.
116 116
117config MEDIA_TUNER_MT2266 117config MEDIA_TUNER_MT2266
118 tristate "Microtune MT2266 silicon tuner" 118 tristate "Microtune MT2266 silicon tuner"
119 depends on VIDEO_MEDIA && I2C 119 depends on VIDEO_MEDIA && I2C
120 default m if DVB_FE_CUSTOMISE 120 default m if MEDIA_TUNER_CUSTOMIZE
121 help 121 help
122 A driver for the silicon baseband tuner MT2266 from Microtune. 122 A driver for the silicon baseband tuner MT2266 from Microtune.
123 123
124config MEDIA_TUNER_MT2131 124config MEDIA_TUNER_MT2131
125 tristate "Microtune MT2131 silicon tuner" 125 tristate "Microtune MT2131 silicon tuner"
126 depends on VIDEO_MEDIA && I2C 126 depends on VIDEO_MEDIA && I2C
127 default m if DVB_FE_CUSTOMISE 127 default m if MEDIA_TUNER_CUSTOMIZE
128 help 128 help
129 A driver for the silicon baseband tuner MT2131 from Microtune. 129 A driver for the silicon baseband tuner MT2131 from Microtune.
130 130
131config MEDIA_TUNER_QT1010 131config MEDIA_TUNER_QT1010
132 tristate "Quantek QT1010 silicon tuner" 132 tristate "Quantek QT1010 silicon tuner"
133 depends on VIDEO_MEDIA && I2C 133 depends on VIDEO_MEDIA && I2C
134 default m if DVB_FE_CUSTOMISE 134 default m if MEDIA_TUNER_CUSTOMIZE
135 help 135 help
136 A driver for the silicon tuner QT1010 from Quantek. 136 A driver for the silicon tuner QT1010 from Quantek.
137 137
@@ -145,7 +145,7 @@ config MEDIA_TUNER_XC2028
145config MEDIA_TUNER_XC5000 145config MEDIA_TUNER_XC5000
146 tristate "Xceive XC5000 silicon tuner" 146 tristate "Xceive XC5000 silicon tuner"
147 depends on VIDEO_MEDIA && I2C 147 depends on VIDEO_MEDIA && I2C
148 default m if DVB_FE_CUSTOMISE 148 default m if MEDIA_TUNER_CUSTOMIZE
149 help 149 help
150 A driver for the silicon tuner XC5000 from Xceive. 150 A driver for the silicon tuner XC5000 from Xceive.
151 This device is only used inside a SiP called togther with a 151 This device is only used inside a SiP called togther with a
@@ -154,21 +154,21 @@ config MEDIA_TUNER_XC5000
154config MEDIA_TUNER_MXL5005S 154config MEDIA_TUNER_MXL5005S
155 tristate "MaxLinear MSL5005S silicon tuner" 155 tristate "MaxLinear MSL5005S silicon tuner"
156 depends on VIDEO_MEDIA && I2C 156 depends on VIDEO_MEDIA && I2C
157 default m if DVB_FE_CUSTOMISE 157 default m if MEDIA_TUNER_CUSTOMIZE
158 help 158 help
159 A driver for the silicon tuner MXL5005S from MaxLinear. 159 A driver for the silicon tuner MXL5005S from MaxLinear.
160 160
161config MEDIA_TUNER_MXL5007T 161config MEDIA_TUNER_MXL5007T
162 tristate "MaxLinear MxL5007T silicon tuner" 162 tristate "MaxLinear MxL5007T silicon tuner"
163 depends on VIDEO_MEDIA && I2C 163 depends on VIDEO_MEDIA && I2C
164 default m if DVB_FE_CUSTOMISE 164 default m if MEDIA_TUNER_CUSTOMIZE
165 help 165 help
166 A driver for the silicon tuner MxL5007T from MaxLinear. 166 A driver for the silicon tuner MxL5007T from MaxLinear.
167 167
168config MEDIA_TUNER_MC44S803 168config MEDIA_TUNER_MC44S803
169 tristate "Freescale MC44S803 Low Power CMOS Broadband tuners" 169 tristate "Freescale MC44S803 Low Power CMOS Broadband tuners"
170 depends on VIDEO_MEDIA && I2C 170 depends on VIDEO_MEDIA && I2C
171 default m if DVB_FE_CUSTOMISE 171 default m if MEDIA_TUNER_CUSTOMIZE
172 help 172 help
173 Say Y here to support the Freescale MC44S803 based tuners 173 Say Y here to support the Freescale MC44S803 based tuners
174 174
diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
index deb00e4acb94..20993ae17d36 100644
--- a/drivers/media/video/au0828/Kconfig
+++ b/drivers/media/video/au0828/Kconfig
@@ -5,9 +5,9 @@ config VIDEO_AU0828
5 select I2C_ALGOBIT 5 select I2C_ALGOBIT
6 select VIDEO_TVEEPROM 6 select VIDEO_TVEEPROM
7 select DVB_AU8522 if !DVB_FE_CUSTOMISE 7 select DVB_AU8522 if !DVB_FE_CUSTOMISE
8 select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE 8 select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
9 select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMISE 9 select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMIZE
10 select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE 10 select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
11 ---help--- 11 ---help---
12 This is a video4linux driver for Auvitek's USB device. 12 This is a video4linux driver for Auvitek's USB device.
13 13
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index 28896aa31506..e603ceb2811b 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -20,10 +20,10 @@ config VIDEO_CX23885
20 select DVB_STV6110 if !DVB_FE_CUSTOMISE 20 select DVB_STV6110 if !DVB_FE_CUSTOMISE
21 select DVB_STV0900 if !DVB_FE_CUSTOMISE 21 select DVB_STV0900 if !DVB_FE_CUSTOMISE
22 select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE 22 select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE
23 select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE 23 select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
24 select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMISE 24 select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
25 select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE 25 select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
26 select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE 26 select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
27 ---help--- 27 ---help---
28 This is a video4linux driver for Conexant 23885 based 28 This is a video4linux driver for Conexant 23885 based
29 TV cards. 29 TV cards.
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index bb42713939ee..17cde17571c7 100644
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -41,9 +41,9 @@ config VIDEO_PVRUSB2_DVB
41 select DVB_S5H1409 if !DVB_FE_CUSTOMISE 41 select DVB_S5H1409 if !DVB_FE_CUSTOMISE
42 select DVB_S5H1411 if !DVB_FE_CUSTOMISE 42 select DVB_S5H1411 if !DVB_FE_CUSTOMISE
43 select DVB_TDA10048 if !DVB_FE_CUSTOMISE 43 select DVB_TDA10048 if !DVB_FE_CUSTOMISE
44 select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE 44 select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
45 select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE 45 select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
46 select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMISE 46 select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
47 ---help--- 47 ---help---
48 48
49 This option enables a DVB interface for the pvrusb2 driver. 49 This option enables a DVB interface for the pvrusb2 driver.