[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>

2 files changed, 19 insertions, 28 deletions

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
           If you are unsure, choose Y.
 
 config VIDEO_CX88_DVB_MT352
-        tristate "Zarlink MT352 DVB-T Support"
-        default m
+        bool "Zarlink MT352 DVB-T Support"
+        default y
         depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
         select DVB_MT352
         ---help---
@@ -55,8 +55,8 @@ config VIDEO_CX88_DVB_MT352
           Connexant 2388x chip and the MT352 demodulator.
 
 config VIDEO_CX88_DVB_OR51132
-        tristate "OR51132 ATSC Support"
-        default m
+        bool "OR51132 ATSC Support"
+        default y
         depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
         select DVB_OR51132
         ---help---
@@ -64,8 +64,8 @@ config VIDEO_CX88_DVB_OR51132
           Connexant 2388x chip and the OR51132 demodulator.
 
 config VIDEO_CX88_DVB_CX22702
-        tristate "Conexant CX22702 DVB-T Support"
-        default m
+        bool "Conexant CX22702 DVB-T Support"
+        default y
         depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
         select DVB_CX22702
         ---help---
@@ -73,8 +73,8 @@ config VIDEO_CX88_DVB_CX22702
           Connexant 2388x chip and the CX22702 demodulator.
 
 config VIDEO_CX88_DVB_LGDT330X
-        tristate "LG Electronics DT3302/DT3303 ATSC Support"
-        default m
+        bool "LG Electronics DT3302/DT3303 ATSC Support"
+        default y
         depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
         select DVB_LGDT330X
         ---help---
@@ -82,8 +82,8 @@ config VIDEO_CX88_DVB_LGDT330X
           Connexant 2388x chip and the LGDT3302/LGDT3303 demodulator.
 
 config VIDEO_CX88_DVB_NXT200X
-        tristate "NXT2002/NXT2004 ATSC Support"
-        default m
+        bool "NXT2002/NXT2004 ATSC Support"
+        default y
         depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
         select DVB_NXT200X
         ---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
 EXTRA_CFLAGS += -I$(src)/..
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
-ifneq ($(CONFIG_VIDEO_BUF_DVB),n)
- EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
-endif
-ifneq ($(CONFIG_DVB_CX22702),n)
- EXTRA_CFLAGS += -DHAVE_CX22702=1
-endif
-ifneq ($(CONFIG_DVB_OR51132),n)
- EXTRA_CFLAGS += -DHAVE_OR51132=1
-endif
-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
+
+extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
+extra-cflags-$(CONFIG_DVB_CX22702)   += -DHAVE_CX22702=1
+extra-cflags-$(CONFIG_DVB_OR51132)   += -DHAVE_OR51132=1
+extra-cflags-$(CONFIG_DVB_LGDT330X)  += -DHAVE_LGDT330X=1
+extra-cflags-$(CONFIG_DVB_MT352)     += -DHAVE_MT352=1
+extra-cflags-$(CONFIG_DVB_NXT200X)   += -DHAVE_NXT200X=1
+
+EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)