diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/Kconfig | 20 | ||||
-rw-r--r-- | drivers/media/video/cx88/Makefile | 27 | ||||
-rw-r--r-- | drivers/media/video/saa7134/Kconfig | 12 | ||||
-rw-r--r-- | drivers/media/video/saa7134/Makefile | 19 |
5 files changed, 33 insertions, 47 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 1a3b3c7e5e99..ecb9a31dd003 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -26,7 +26,7 @@ config VIDEO_BT848 | |||
26 | module will be called bttv. | 26 | module will be called bttv. |
27 | 27 | ||
28 | config VIDEO_BT848_DVB | 28 | config VIDEO_BT848_DVB |
29 | tristate "DVB/ATSC Support for bt878 based TV cards" | 29 | bool "DVB/ATSC Support for bt878 based TV cards" |
30 | depends on VIDEO_BT848 && DVB_CORE | 30 | depends on VIDEO_BT848 && DVB_CORE |
31 | select DVB_BT8XX | 31 | select DVB_BT8XX |
32 | ---help--- | 32 | ---help--- |
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index 41818b6205b3..85ba4106dc79 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig | |||
@@ -46,8 +46,8 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS | |||
46 | If you are unsure, choose Y. | 46 | If you are unsure, choose Y. |
47 | 47 | ||
48 | config VIDEO_CX88_DVB_MT352 | 48 | config VIDEO_CX88_DVB_MT352 |
49 | tristate "Zarlink MT352 DVB-T Support" | 49 | bool "Zarlink MT352 DVB-T Support" |
50 | default m | 50 | default y |
51 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS | 51 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS |
52 | select DVB_MT352 | 52 | select DVB_MT352 |
53 | ---help--- | 53 | ---help--- |
@@ -55,8 +55,8 @@ config VIDEO_CX88_DVB_MT352 | |||
55 | Connexant 2388x chip and the MT352 demodulator. | 55 | Connexant 2388x chip and the MT352 demodulator. |
56 | 56 | ||
57 | config VIDEO_CX88_DVB_OR51132 | 57 | config VIDEO_CX88_DVB_OR51132 |
58 | tristate "OR51132 ATSC Support" | 58 | bool "OR51132 ATSC Support" |
59 | default m | 59 | default y |
60 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS | 60 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS |
61 | select DVB_OR51132 | 61 | select DVB_OR51132 |
62 | ---help--- | 62 | ---help--- |
@@ -64,8 +64,8 @@ config VIDEO_CX88_DVB_OR51132 | |||
64 | Connexant 2388x chip and the OR51132 demodulator. | 64 | Connexant 2388x chip and the OR51132 demodulator. |
65 | 65 | ||
66 | config VIDEO_CX88_DVB_CX22702 | 66 | config VIDEO_CX88_DVB_CX22702 |
67 | tristate "Conexant CX22702 DVB-T Support" | 67 | bool "Conexant CX22702 DVB-T Support" |
68 | default m | 68 | default y |
69 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS | 69 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS |
70 | select DVB_CX22702 | 70 | select DVB_CX22702 |
71 | ---help--- | 71 | ---help--- |
@@ -73,8 +73,8 @@ config VIDEO_CX88_DVB_CX22702 | |||
73 | Connexant 2388x chip and the CX22702 demodulator. | 73 | Connexant 2388x chip and the CX22702 demodulator. |
74 | 74 | ||
75 | config VIDEO_CX88_DVB_LGDT330X | 75 | config VIDEO_CX88_DVB_LGDT330X |
76 | tristate "LG Electronics DT3302/DT3303 ATSC Support" | 76 | bool "LG Electronics DT3302/DT3303 ATSC Support" |
77 | default m | 77 | default y |
78 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS | 78 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS |
79 | select DVB_LGDT330X | 79 | select DVB_LGDT330X |
80 | ---help--- | 80 | ---help--- |
@@ -82,8 +82,8 @@ config VIDEO_CX88_DVB_LGDT330X | |||
82 | Connexant 2388x chip and the LGDT3302/LGDT3303 demodulator. | 82 | Connexant 2388x chip and the LGDT3302/LGDT3303 demodulator. |
83 | 83 | ||
84 | config VIDEO_CX88_DVB_NXT200X | 84 | config VIDEO_CX88_DVB_NXT200X |
85 | tristate "NXT2002/NXT2004 ATSC Support" | 85 | bool "NXT2002/NXT2004 ATSC Support" |
86 | default m | 86 | default y |
87 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS | 87 | depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS |
88 | select DVB_NXT200X | 88 | select DVB_NXT200X |
89 | ---help--- | 89 | ---help--- |
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile index 0df40b773454..54401b02b7ce 100644 --- a/drivers/media/video/cx88/Makefile +++ b/drivers/media/video/cx88/Makefile | |||
@@ -9,21 +9,12 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o | |||
9 | EXTRA_CFLAGS += -I$(src)/.. | 9 | EXTRA_CFLAGS += -I$(src)/.. |
10 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core | 10 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core |
11 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends | 11 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends |
12 | ifneq ($(CONFIG_VIDEO_BUF_DVB),n) | 12 | |
13 | EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1 | 13 | extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1 |
14 | endif | 14 | extra-cflags-$(CONFIG_DVB_CX22702) += -DHAVE_CX22702=1 |
15 | ifneq ($(CONFIG_DVB_CX22702),n) | 15 | extra-cflags-$(CONFIG_DVB_OR51132) += -DHAVE_OR51132=1 |
16 | EXTRA_CFLAGS += -DHAVE_CX22702=1 | 16 | extra-cflags-$(CONFIG_DVB_LGDT330X) += -DHAVE_LGDT330X=1 |
17 | endif | 17 | extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1 |
18 | ifneq ($(CONFIG_DVB_OR51132),n) | 18 | extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1 |
19 | EXTRA_CFLAGS += -DHAVE_OR51132=1 | 19 | |
20 | endif | 20 | EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) |
21 | ifneq ($(CONFIG_DVB_LGDT330X),n) | ||
22 | EXTRA_CFLAGS += -DHAVE_LGDT330X=1 | ||
23 | endif | ||
24 | ifneq ($(CONFIG_DVB_MT352),n) | ||
25 | EXTRA_CFLAGS += -DHAVE_MT352=1 | ||
26 | endif | ||
27 | ifneq ($(CONFIG_DVB_NXT200X),n) | ||
28 | EXTRA_CFLAGS += -DHAVE_NXT200X=1 | ||
29 | endif | ||
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig index 7bdeabe638ca..c512c4411b38 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig | |||
@@ -42,8 +42,8 @@ config VIDEO_SAA7134_DVB_ALL_FRONTENDS | |||
42 | If you are unsure, choose Y. | 42 | If you are unsure, choose Y. |
43 | 43 | ||
44 | config VIDEO_SAA7134_DVB_MT352 | 44 | config VIDEO_SAA7134_DVB_MT352 |
45 | tristate "Zarlink MT352 DVB-T Support" | 45 | bool "Zarlink MT352 DVB-T Support" |
46 | default m | 46 | default y |
47 | depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS | 47 | depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS |
48 | select DVB_MT352 | 48 | select DVB_MT352 |
49 | ---help--- | 49 | ---help--- |
@@ -51,8 +51,8 @@ config VIDEO_SAA7134_DVB_MT352 | |||
51 | Philips saa7134 chip and the MT352 demodulator. | 51 | Philips saa7134 chip and the MT352 demodulator. |
52 | 52 | ||
53 | config VIDEO_SAA7134_DVB_TDA1004X | 53 | config VIDEO_SAA7134_DVB_TDA1004X |
54 | tristate "Phillips TDA10045H/TDA10046H DVB-T Support" | 54 | bool "Phillips TDA10045H/TDA10046H DVB-T Support" |
55 | default m | 55 | default y |
56 | depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS | 56 | depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS |
57 | select DVB_TDA1004X | 57 | select DVB_TDA1004X |
58 | ---help--- | 58 | ---help--- |
@@ -60,8 +60,8 @@ config VIDEO_SAA7134_DVB_TDA1004X | |||
60 | Philips saa7134 chip and the TDA10045H/TDA10046H demodulator. | 60 | Philips saa7134 chip and the TDA10045H/TDA10046H demodulator. |
61 | 61 | ||
62 | config VIDEO_SAA7134_DVB_NXT200X | 62 | config VIDEO_SAA7134_DVB_NXT200X |
63 | tristate "NXT2002/NXT2004 ATSC Support" | 63 | bool "NXT2002/NXT2004 ATSC Support" |
64 | default m | 64 | default y |
65 | depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS | 65 | depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS |
66 | select DVB_NXT200X | 66 | select DVB_NXT200X |
67 | ---help--- | 67 | ---help--- |
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile index 4226b61cc613..134f83a96218 100644 --- a/drivers/media/video/saa7134/Makefile +++ b/drivers/media/video/saa7134/Makefile | |||
@@ -11,15 +11,10 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o | |||
11 | EXTRA_CFLAGS += -I$(src)/.. | 11 | EXTRA_CFLAGS += -I$(src)/.. |
12 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core | 12 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core |
13 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends | 13 | EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends |
14 | ifneq ($(CONFIG_VIDEO_BUF_DVB),n) | 14 | |
15 | EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1 | 15 | extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1 |
16 | endif | 16 | extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1 |
17 | ifneq ($(CONFIG_DVB_MT352),n) | 17 | extra-cflags-$(CONFIG_DVB_TDA1004X) += -DHAVE_TDA1004X=1 |
18 | EXTRA_CFLAGS += -DHAVE_MT352=1 | 18 | extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1 |
19 | endif | 19 | |
20 | ifneq ($(CONFIG_DVB_TDA1004X),n) | 20 | EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) |
21 | EXTRA_CFLAGS += -DHAVE_TDA1004X=1 | ||
22 | endif | ||
23 | ifneq ($(CONFIG_DVB_NXT200X),n) | ||
24 | EXTRA_CFLAGS += -DHAVE_NXT200X=1 | ||
25 | endif | ||