diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-26 15:19:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 17:41:37 -0400 |
commit | df7aaaf3a74016cbc72382b6388c7c62f3df49b2 (patch) | |
tree | 26247ea3dd9049f84139e4168d78d1bd8f4f1be0 /drivers | |
parent | 7c91f0624a9a2b8b9b122cf94fef34bc7f7347a6 (diff) |
V4L/DVB (7768): reorganize some DVB-S Kconfig items
There are some DVB-S tuners together with DVB-S tags, while
others together with tuners. Better to have all of them together.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/frontends/Kconfig | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig index 75e7d20b2984..1486d96fd4b6 100644 --- a/drivers/media/dvb/frontends/Kconfig +++ b/drivers/media/dvb/frontends/Kconfig | |||
@@ -15,22 +15,36 @@ config DVB_FE_CUSTOMISE | |||
15 | comment "DVB-S (satellite) frontends" | 15 | comment "DVB-S (satellite) frontends" |
16 | depends on DVB_CORE | 16 | depends on DVB_CORE |
17 | 17 | ||
18 | config DVB_STV0299 | 18 | config DVB_CX24110 |
19 | tristate "ST STV0299 based" | 19 | tristate "Conexant CX24110 based" |
20 | depends on DVB_CORE && I2C | 20 | depends on DVB_CORE && I2C |
21 | default m if DVB_FE_CUSTOMISE | 21 | default m if DVB_FE_CUSTOMISE |
22 | help | 22 | help |
23 | A DVB-S tuner module. Say Y when you want to support this frontend. | 23 | A DVB-S tuner module. Say Y when you want to support this frontend. |
24 | 24 | ||
25 | config DVB_CX24110 | 25 | config DVB_CX24123 |
26 | tristate "Conexant CX24110 based" | 26 | tristate "Conexant CX24123 based" |
27 | depends on DVB_CORE && I2C | 27 | depends on DVB_CORE && I2C |
28 | default m if DVB_FE_CUSTOMISE | 28 | default m if DVB_FE_CUSTOMISE |
29 | help | 29 | help |
30 | A DVB-S tuner module. Say Y when you want to support this frontend. | 30 | A DVB-S tuner module. Say Y when you want to support this frontend. |
31 | 31 | ||
32 | config DVB_CX24123 | 32 | config DVB_MT312 |
33 | tristate "Conexant CX24123 based" | 33 | tristate "Zarlink VP310/MT312 based" |
34 | depends on DVB_CORE && I2C | ||
35 | default m if DVB_FE_CUSTOMISE | ||
36 | help | ||
37 | A DVB-S tuner module. Say Y when you want to support this frontend. | ||
38 | |||
39 | config DVB_S5H1420 | ||
40 | tristate "Samsung S5H1420 based" | ||
41 | depends on DVB_CORE && I2C | ||
42 | default m if DVB_FE_CUSTOMISE | ||
43 | help | ||
44 | A DVB-S tuner module. Say Y when you want to support this frontend. | ||
45 | |||
46 | config DVB_STV0299 | ||
47 | tristate "ST STV0299 based" | ||
34 | depends on DVB_CORE && I2C | 48 | depends on DVB_CORE && I2C |
35 | default m if DVB_FE_CUSTOMISE | 49 | default m if DVB_FE_CUSTOMISE |
36 | help | 50 | help |
@@ -43,8 +57,8 @@ config DVB_TDA8083 | |||
43 | help | 57 | help |
44 | A DVB-S tuner module. Say Y when you want to support this frontend. | 58 | A DVB-S tuner module. Say Y when you want to support this frontend. |
45 | 59 | ||
46 | config DVB_MT312 | 60 | config DVB_TDA10086 |
47 | tristate "Zarlink VP310/MT312 based" | 61 | tristate "Philips TDA10086 based" |
48 | depends on DVB_CORE && I2C | 62 | depends on DVB_CORE && I2C |
49 | default m if DVB_FE_CUSTOMISE | 63 | default m if DVB_FE_CUSTOMISE |
50 | help | 64 | help |
@@ -57,19 +71,26 @@ config DVB_VES1X93 | |||
57 | help | 71 | help |
58 | A DVB-S tuner module. Say Y when you want to support this frontend. | 72 | A DVB-S tuner module. Say Y when you want to support this frontend. |
59 | 73 | ||
60 | config DVB_S5H1420 | 74 | config DVB_TUNER_ITD1000 |
61 | tristate "Samsung S5H1420 based" | 75 | tristate "Integrant ITD1000 Zero IF tuner for DVB-S/DSS" |
62 | depends on DVB_CORE && I2C | 76 | depends on DVB_CORE && I2C |
63 | default m if DVB_FE_CUSTOMISE | 77 | default m if DVB_FE_CUSTOMISE |
64 | help | 78 | help |
65 | A DVB-S tuner module. Say Y when you want to support this frontend. | 79 | A DVB-S tuner module. Say Y when you want to support this frontend. |
66 | 80 | ||
67 | config DVB_TDA10086 | 81 | config DVB_TDA826X |
68 | tristate "Philips TDA10086 based" | 82 | tristate "Philips TDA826X silicon tuner" |
69 | depends on DVB_CORE && I2C | 83 | depends on DVB_CORE && I2C |
70 | default m if DVB_FE_CUSTOMISE | 84 | default m if DVB_FE_CUSTOMISE |
71 | help | 85 | help |
72 | A DVB-S tuner module. Say Y when you want to support this frontend. | 86 | A DVB-S silicon tuner module. Say Y when you want to support this tuner. |
87 | |||
88 | config DVB_TUA6100 | ||
89 | tristate "Infineon TUA6100 PLL" | ||
90 | depends on DVB_CORE && I2C | ||
91 | default m if DVB_FE_CUSTOMISE | ||
92 | help | ||
93 | A DVB-S PLL chip. | ||
73 | 94 | ||
74 | comment "DVB-T (terrestrial) frontends" | 95 | comment "DVB-T (terrestrial) frontends" |
75 | depends on DVB_CORE | 96 | depends on DVB_CORE |
@@ -326,13 +347,6 @@ config DVB_PLL | |||
326 | This module drives a number of tuners based on PLL chips with a | 347 | This module drives a number of tuners based on PLL chips with a |
327 | common I2C interface. Say Y when you want to support these tuners. | 348 | common I2C interface. Say Y when you want to support these tuners. |
328 | 349 | ||
329 | config DVB_TDA826X | ||
330 | tristate "Philips TDA826X silicon tuner" | ||
331 | depends on DVB_CORE && I2C | ||
332 | default m if DVB_FE_CUSTOMISE | ||
333 | help | ||
334 | A DVB-S silicon tuner module. Say Y when you want to support this tuner. | ||
335 | |||
336 | config DVB_TUNER_QT1010 | 350 | config DVB_TUNER_QT1010 |
337 | tristate "Quantek QT1010 silicon tuner" | 351 | tristate "Quantek QT1010 silicon tuner" |
338 | depends on DVB_CORE && I2C | 352 | depends on DVB_CORE && I2C |
@@ -370,12 +384,7 @@ config DVB_TUNER_DIB0070 | |||
370 | This device is only used inside a SiP called togther with a | 384 | This device is only used inside a SiP called togther with a |
371 | demodulator for now. | 385 | demodulator for now. |
372 | 386 | ||
373 | config DVB_TUNER_ITD1000 | 387 | comment "SEC control devices for DVB-S" |
374 | tristate "Integrant ITD1000 Zero IF tuner for DVB-S/DSS" | ||
375 | depends on DVB_CORE && I2C | ||
376 | default m if DVB_FE_CUSTOMISE | ||
377 | |||
378 | comment "Miscellaneous devices" | ||
379 | depends on DVB_CORE | 388 | depends on DVB_CORE |
380 | 389 | ||
381 | config DVB_LNBP21 | 390 | config DVB_LNBP21 |
@@ -399,11 +408,4 @@ config DVB_ISL6421 | |||
399 | help | 408 | help |
400 | An SEC control chip. | 409 | An SEC control chip. |
401 | 410 | ||
402 | config DVB_TUA6100 | ||
403 | tristate "TUA6100 PLL" | ||
404 | depends on DVB_CORE && I2C | ||
405 | default m if DVB_FE_CUSTOMISE | ||
406 | help | ||
407 | A DVBS PLL chip. | ||
408 | |||
409 | endmenu | 411 | endmenu |