Commit 20c5ab68 authored by Michael Krufky's avatar Michael Krufky Committed by Linus Torvalds

[PATCH] fix broken hybrid v4l-dvb frontend selection

Repair broken build configuration for hybrid v4l/dvb card frontend
selection.
Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f7b7fd8f
...@@ -26,7 +26,7 @@ config VIDEO_BT848 ...@@ -26,7 +26,7 @@ config VIDEO_BT848
module will be called bttv. module will be called bttv.
config VIDEO_BT848_DVB config VIDEO_BT848_DVB
tristate "DVB/ATSC Support for bt878 based TV cards" bool "DVB/ATSC Support for bt878 based TV cards"
depends on VIDEO_BT848 && DVB_CORE depends on VIDEO_BT848 && DVB_CORE
select DVB_BT8XX select DVB_BT8XX
---help--- ---help---
......
...@@ -46,8 +46,8 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS ...@@ -46,8 +46,8 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS
If you are unsure, choose Y. If you are unsure, choose Y.
config VIDEO_CX88_DVB_MT352 config VIDEO_CX88_DVB_MT352
tristate "Zarlink MT352 DVB-T Support" bool "Zarlink MT352 DVB-T Support"
default m default y
depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
select DVB_MT352 select DVB_MT352
---help--- ---help---
...@@ -55,8 +55,8 @@ config VIDEO_CX88_DVB_MT352 ...@@ -55,8 +55,8 @@ config VIDEO_CX88_DVB_MT352
Connexant 2388x chip and the MT352 demodulator. Connexant 2388x chip and the MT352 demodulator.
config VIDEO_CX88_DVB_OR51132 config VIDEO_CX88_DVB_OR51132
tristate "OR51132 ATSC Support" bool "OR51132 ATSC Support"
default m default y
depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
select DVB_OR51132 select DVB_OR51132
---help--- ---help---
...@@ -64,8 +64,8 @@ config VIDEO_CX88_DVB_OR51132 ...@@ -64,8 +64,8 @@ config VIDEO_CX88_DVB_OR51132
Connexant 2388x chip and the OR51132 demodulator. Connexant 2388x chip and the OR51132 demodulator.
config VIDEO_CX88_DVB_CX22702 config VIDEO_CX88_DVB_CX22702
tristate "Conexant CX22702 DVB-T Support" bool "Conexant CX22702 DVB-T Support"
default m default y
depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
select DVB_CX22702 select DVB_CX22702
---help--- ---help---
...@@ -73,8 +73,8 @@ config VIDEO_CX88_DVB_CX22702 ...@@ -73,8 +73,8 @@ config VIDEO_CX88_DVB_CX22702
Connexant 2388x chip and the CX22702 demodulator. Connexant 2388x chip and the CX22702 demodulator.
config VIDEO_CX88_DVB_LGDT330X config VIDEO_CX88_DVB_LGDT330X
tristate "LG Electronics DT3302/DT3303 ATSC Support" bool "LG Electronics DT3302/DT3303 ATSC Support"
default m default y
depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
select DVB_LGDT330X select DVB_LGDT330X
---help--- ---help---
...@@ -82,8 +82,8 @@ config VIDEO_CX88_DVB_LGDT330X ...@@ -82,8 +82,8 @@ config VIDEO_CX88_DVB_LGDT330X
Connexant 2388x chip and the LGDT3302/LGDT3303 demodulator. Connexant 2388x chip and the LGDT3302/LGDT3303 demodulator.
config VIDEO_CX88_DVB_NXT200X config VIDEO_CX88_DVB_NXT200X
tristate "NXT2002/NXT2004 ATSC Support" bool "NXT2002/NXT2004 ATSC Support"
default m default y
depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
select DVB_NXT200X select DVB_NXT200X
---help--- ---help---
......
...@@ -9,21 +9,12 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o ...@@ -9,21 +9,12 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
EXTRA_CFLAGS += -I$(src)/.. EXTRA_CFLAGS += -I$(src)/..
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
ifneq ($(CONFIG_VIDEO_BUF_DVB),n)
EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1 extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
endif extra-cflags-$(CONFIG_DVB_CX22702) += -DHAVE_CX22702=1
ifneq ($(CONFIG_DVB_CX22702),n) extra-cflags-$(CONFIG_DVB_OR51132) += -DHAVE_OR51132=1
EXTRA_CFLAGS += -DHAVE_CX22702=1 extra-cflags-$(CONFIG_DVB_LGDT330X) += -DHAVE_LGDT330X=1
endif extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1
ifneq ($(CONFIG_DVB_OR51132),n) extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1
EXTRA_CFLAGS += -DHAVE_OR51132=1
endif EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
ifneq ($(CONFIG_DVB_LGDT330X),n)
EXTRA_CFLAGS += -DHAVE_LGDT330X=1
endif
ifneq ($(CONFIG_DVB_MT352),n)
EXTRA_CFLAGS += -DHAVE_MT352=1
endif
ifneq ($(CONFIG_DVB_NXT200X),n)
EXTRA_CFLAGS += -DHAVE_NXT200X=1
endif
...@@ -42,8 +42,8 @@ config VIDEO_SAA7134_DVB_ALL_FRONTENDS ...@@ -42,8 +42,8 @@ config VIDEO_SAA7134_DVB_ALL_FRONTENDS
If you are unsure, choose Y. If you are unsure, choose Y.
config VIDEO_SAA7134_DVB_MT352 config VIDEO_SAA7134_DVB_MT352
tristate "Zarlink MT352 DVB-T Support" bool "Zarlink MT352 DVB-T Support"
default m default y
depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
select DVB_MT352 select DVB_MT352
---help--- ---help---
...@@ -51,8 +51,8 @@ config VIDEO_SAA7134_DVB_MT352 ...@@ -51,8 +51,8 @@ config VIDEO_SAA7134_DVB_MT352
Philips saa7134 chip and the MT352 demodulator. Philips saa7134 chip and the MT352 demodulator.
config VIDEO_SAA7134_DVB_TDA1004X config VIDEO_SAA7134_DVB_TDA1004X
tristate "Phillips TDA10045H/TDA10046H DVB-T Support" bool "Phillips TDA10045H/TDA10046H DVB-T Support"
default m default y
depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
select DVB_TDA1004X select DVB_TDA1004X
---help--- ---help---
...@@ -60,8 +60,8 @@ config VIDEO_SAA7134_DVB_TDA1004X ...@@ -60,8 +60,8 @@ config VIDEO_SAA7134_DVB_TDA1004X
Philips saa7134 chip and the TDA10045H/TDA10046H demodulator. Philips saa7134 chip and the TDA10045H/TDA10046H demodulator.
config VIDEO_SAA7134_DVB_NXT200X config VIDEO_SAA7134_DVB_NXT200X
tristate "NXT2002/NXT2004 ATSC Support" bool "NXT2002/NXT2004 ATSC Support"
default m default y
depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
select DVB_NXT200X select DVB_NXT200X
---help--- ---help---
......
...@@ -11,15 +11,10 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o ...@@ -11,15 +11,10 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
EXTRA_CFLAGS += -I$(src)/.. EXTRA_CFLAGS += -I$(src)/..
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
ifneq ($(CONFIG_VIDEO_BUF_DVB),n)
EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1 extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
endif extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1
ifneq ($(CONFIG_DVB_MT352),n) extra-cflags-$(CONFIG_DVB_TDA1004X) += -DHAVE_TDA1004X=1
EXTRA_CFLAGS += -DHAVE_MT352=1 extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1
endif
ifneq ($(CONFIG_DVB_TDA1004X),n) EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
EXTRA_CFLAGS += -DHAVE_TDA1004X=1
endif
ifneq ($(CONFIG_DVB_NXT200X),n)
EXTRA_CFLAGS += -DHAVE_NXT200X=1
endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment