tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] fix broken hybrid v4l-dvb frontend selection

Repair broken build configuration for hybrid v4l/dvb card frontend
selection.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Michael Krufky and committed by
Linus Torvalds 20c5ab68 f7b7fd8f

+33 -47
unified split
+1 -1
drivers/media/video/Kconfig
··· 26 26 module will be called bttv. 27 27 28 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 30 depends on VIDEO_BT848 && DVB_CORE 31 31 select DVB_BT8XX 32 32 ---help---
+10 -10
drivers/media/video/cx88/Kconfig
··· 46 46 If you are unsure, choose Y. 47 47 48 48 config VIDEO_CX88_DVB_MT352 49 - tristate "Zarlink MT352 DVB-T Support" 50 - default m 49 + bool "Zarlink MT352 DVB-T Support" 50 + default y 51 51 depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS 52 52 select DVB_MT352 53 53 ---help--- ··· 55 55 Connexant 2388x chip and the MT352 demodulator. 56 56 57 57 config VIDEO_CX88_DVB_OR51132 58 - tristate "OR51132 ATSC Support" 59 - default m 58 + bool "OR51132 ATSC Support" 59 + default y 60 60 depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS 61 61 select DVB_OR51132 62 62 ---help--- ··· 64 64 Connexant 2388x chip and the OR51132 demodulator. 65 65 66 66 config VIDEO_CX88_DVB_CX22702 67 - tristate "Conexant CX22702 DVB-T Support" 68 - default m 67 + bool "Conexant CX22702 DVB-T Support" 68 + default y 69 69 depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS 70 70 select DVB_CX22702 71 71 ---help--- ··· 73 73 Connexant 2388x chip and the CX22702 demodulator. 74 74 75 75 config VIDEO_CX88_DVB_LGDT330X 76 - tristate "LG Electronics DT3302/DT3303 ATSC Support" 77 - default m 76 + bool "LG Electronics DT3302/DT3303 ATSC Support" 77 + default y 78 78 depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS 79 79 select DVB_LGDT330X 80 80 ---help--- ··· 82 82 Connexant 2388x chip and the LGDT3302/LGDT3303 demodulator. 83 83 84 84 config VIDEO_CX88_DVB_NXT200X 85 - tristate "NXT2002/NXT2004 ATSC Support" 86 - default m 85 + bool "NXT2002/NXT2004 ATSC Support" 86 + default y 87 87 depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS 88 88 select DVB_NXT200X 89 89 ---help---
+9 -18
drivers/media/video/cx88/Makefile
··· 9 9 EXTRA_CFLAGS += -I$(src)/.. 10 10 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core 11 11 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends 12 - ifneq ($(CONFIG_VIDEO_BUF_DVB),n) 13 - EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1 14 - endif 15 - ifneq ($(CONFIG_DVB_CX22702),n) 16 - EXTRA_CFLAGS += -DHAVE_CX22702=1 17 - endif 18 - ifneq ($(CONFIG_DVB_OR51132),n) 19 - EXTRA_CFLAGS += -DHAVE_OR51132=1 20 - endif 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 12 + 13 + extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1 14 + extra-cflags-$(CONFIG_DVB_CX22702) += -DHAVE_CX22702=1 15 + extra-cflags-$(CONFIG_DVB_OR51132) += -DHAVE_OR51132=1 16 + extra-cflags-$(CONFIG_DVB_LGDT330X) += -DHAVE_LGDT330X=1 17 + extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1 18 + extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1 19 + 20 + EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
+6 -6
drivers/media/video/saa7134/Kconfig
··· 42 42 If you are unsure, choose Y. 43 43 44 44 config VIDEO_SAA7134_DVB_MT352 45 - tristate "Zarlink MT352 DVB-T Support" 46 - default m 45 + bool "Zarlink MT352 DVB-T Support" 46 + default y 47 47 depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS 48 48 select DVB_MT352 49 49 ---help--- ··· 51 51 Philips saa7134 chip and the MT352 demodulator. 52 52 53 53 config VIDEO_SAA7134_DVB_TDA1004X 54 - tristate "Phillips TDA10045H/TDA10046H DVB-T Support" 55 - default m 54 + bool "Phillips TDA10045H/TDA10046H DVB-T Support" 55 + default y 56 56 depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS 57 57 select DVB_TDA1004X 58 58 ---help--- ··· 60 60 Philips saa7134 chip and the TDA10045H/TDA10046H demodulator. 61 61 62 62 config VIDEO_SAA7134_DVB_NXT200X 63 - tristate "NXT2002/NXT2004 ATSC Support" 64 - default m 63 + bool "NXT2002/NXT2004 ATSC Support" 64 + default y 65 65 depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS 66 66 select DVB_NXT200X 67 67 ---help---
+7 -12
drivers/media/video/saa7134/Makefile
··· 11 11 EXTRA_CFLAGS += -I$(src)/.. 12 12 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core 13 13 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends 14 - ifneq ($(CONFIG_VIDEO_BUF_DVB),n) 15 - EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1 16 - endif 17 - ifneq ($(CONFIG_DVB_MT352),n) 18 - EXTRA_CFLAGS += -DHAVE_MT352=1 19 - endif 20 - ifneq ($(CONFIG_DVB_TDA1004X),n) 21 - EXTRA_CFLAGS += -DHAVE_TDA1004X=1 22 - endif 23 - ifneq ($(CONFIG_DVB_NXT200X),n) 24 - EXTRA_CFLAGS += -DHAVE_NXT200X=1 25 - endif 14 + 15 + extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1 16 + extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1 17 + extra-cflags-$(CONFIG_DVB_TDA1004X) += -DHAVE_TDA1004X=1 18 + extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1 19 + 20 + EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)