diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-15 00:36:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-18 15:12:18 -0500 |
commit | 60a6dc55b93b3321afa52f650a149fb7e87fa85a (patch) | |
tree | efecc6f31f68df2d7db8b7baaf2ca3f2b49cd773 | |
parent | 7215fdb214ad8d76c9d667be07f870f0f0544959 (diff) |
[PATCH] Kconfig: swap VIDEO_CX88_ALSA and VIDEO_CX88_DVB
VIDEO_CX88_ALSA should not be between VIDEO_CX88_DVB and
VIDEO_CX88_DVB_ALL_FRONTENDS
When cx88-alsa was added to cx88/Kconfig, it was added in between
VIDEO_CX88_DVB and VIDEO_CX88_DVB_ALL_FRONTENDS. This caused
undesireable effects to the appearance of the menu options in
menuconfig.
This fix reorders cx88-alsa and cx88-dvb in Kconfig, to match saa7134,
and restore the correct menuconfig appearance.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/media/video/cx88/Kconfig | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index e99dfbbf3e95..87d79df05336 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig | |||
@@ -15,20 +15,6 @@ config VIDEO_CX88 | |||
15 | To compile this driver as a module, choose M here: the | 15 | To compile this driver as a module, choose M here: the |
16 | module will be called cx8800 | 16 | module will be called cx8800 |
17 | 17 | ||
18 | config VIDEO_CX88_DVB | ||
19 | tristate "DVB/ATSC Support for cx2388x based TV cards" | ||
20 | depends on VIDEO_CX88 && DVB_CORE | ||
21 | select VIDEO_BUF_DVB | ||
22 | ---help--- | ||
23 | This adds support for DVB/ATSC cards based on the | ||
24 | Connexant 2388x chip. | ||
25 | |||
26 | To compile this driver as a module, choose M here: the | ||
27 | module will be called cx88-dvb. | ||
28 | |||
29 | You must also select one or more DVB/ATSC demodulators. | ||
30 | If you are unsure which you need, choose all of them. | ||
31 | |||
32 | config VIDEO_CX88_ALSA | 18 | config VIDEO_CX88_ALSA |
33 | tristate "ALSA DMA audio support" | 19 | tristate "ALSA DMA audio support" |
34 | depends on VIDEO_CX88 && SND && EXPERIMENTAL | 20 | depends on VIDEO_CX88 && SND && EXPERIMENTAL |
@@ -44,6 +30,20 @@ config VIDEO_CX88_ALSA | |||
44 | To compile this driver as a module, choose M here: the | 30 | To compile this driver as a module, choose M here: the |
45 | module will be called cx88-alsa. | 31 | module will be called cx88-alsa. |
46 | 32 | ||
33 | config VIDEO_CX88_DVB | ||
34 | tristate "DVB/ATSC Support for cx2388x based TV cards" | ||
35 | depends on VIDEO_CX88 && DVB_CORE | ||
36 | select VIDEO_BUF_DVB | ||
37 | ---help--- | ||
38 | This adds support for DVB/ATSC cards based on the | ||
39 | Connexant 2388x chip. | ||
40 | |||
41 | To compile this driver as a module, choose M here: the | ||
42 | module will be called cx88-dvb. | ||
43 | |||
44 | You must also select one or more DVB/ATSC demodulators. | ||
45 | If you are unsure which you need, choose all of them. | ||
46 | |||
47 | config VIDEO_CX88_DVB_ALL_FRONTENDS | 47 | config VIDEO_CX88_DVB_ALL_FRONTENDS |
48 | bool "Build all supported frontends for cx2388x based TV cards" | 48 | bool "Build all supported frontends for cx2388x based TV cards" |
49 | default y | 49 | default y |