From: Michael Krufky <mkrufky@m1k.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Sam Ravnborg <sam@ravnborg.org>, Adrian Bunk <bunk@stusta.de>,
Gene Heskett <gene.heskett@verizon.net>,
linux-kernel@vger.kernel.org,
Johannes Stezenbach <js@linuxtv.org>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
Andrew Morton <akpm@osdl.org>
Subject: [PATCH] fix broken hybrid v4l-dvb frontend selection
Date: Sat, 26 Nov 2005 15:30:46 -0500 [thread overview]
Message-ID: <4388C5F6.70705@m1k.net> (raw)
In-Reply-To: <20051123182609.GA8336@mars.ravnborg.org>
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
Linus-
This patch corrects the build problems for cx88 and saa7134 hybrid
v4l/dvb drivers, described in the "Re: Linux 2.6.15-rc2" thread on LKML,
by Adrian and Gene. Please apply this to your -git tree.
Adrian Bunk wrote:
>configurations like CONFIG_VIDEO_CX88_DVB=y, CONFIG_DVB_CX22702=m are currently compile
>errors.
>
>
Gene Heskett wrote:
>*** Warning: "nxt200x_attach" [drivers/media/video/cx88/cx88-dvb.ko]
>undefined!
>
>
Thanks to Sam Ravnborg for pointing out a much needed correction in the
Makefile.
[-- Attachment #2: hybrid-frontend-selection-fix.patch --]
[-- Type: text/x-patch, Size: 5686 bytes --]
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>
drivers/media/video/Kconfig | 2 +-
drivers/media/video/cx88/Kconfig | 20 ++++++++++----------
drivers/media/video/cx88/Makefile | 27 +++++++++------------------
drivers/media/video/saa7134/Kconfig | 12 ++++++------
drivers/media/video/saa7134/Makefile | 19 +++++++------------
5 files changed, 33 insertions(+), 47 deletions(-)
--- linux-2.6.15-rc2-git6.orig/drivers/media/video/cx88/Kconfig
+++ linux-2.6.15-rc2-git6/drivers/media/video/cx88/Kconfig
@@ -46,8 +46,8 @@
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 @@
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 @@
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 @@
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 @@
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---
--- linux-2.6.15-rc2-git6.orig/drivers/media/video/Kconfig
+++ linux-2.6.15-rc2-git6/drivers/media/video/Kconfig
@@ -26,7 +26,7 @@
module will be called bttv.
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
select DVB_BT8XX
---help---
--- linux-2.6.15-rc2-git6.orig/drivers/media/video/saa7134/Kconfig
+++ linux-2.6.15-rc2-git6/drivers/media/video/saa7134/Kconfig
@@ -42,8 +42,8 @@
If you are unsure, choose Y.
config VIDEO_SAA7134_DVB_MT352
- tristate "Zarlink MT352 DVB-T Support"
- default m
+ bool "Zarlink MT352 DVB-T Support"
+ default y
depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
select DVB_MT352
---help---
@@ -51,8 +51,8 @@
Philips saa7134 chip and the MT352 demodulator.
config VIDEO_SAA7134_DVB_TDA1004X
- tristate "Phillips TDA10045H/TDA10046H DVB-T Support"
- default m
+ bool "Phillips TDA10045H/TDA10046H DVB-T Support"
+ default y
depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
select DVB_TDA1004X
---help---
@@ -60,8 +60,8 @@
Philips saa7134 chip and the TDA10045H/TDA10046H demodulator.
config VIDEO_SAA7134_DVB_NXT200X
- tristate "NXT2002/NXT2004 ATSC Support"
- default m
+ bool "NXT2002/NXT2004 ATSC Support"
+ default y
depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
select DVB_NXT200X
---help---
--- linux-2.6.15-rc2-git6.orig/drivers/media/video/cx88/Makefile
+++ linux-2.6.15-rc2-git6/drivers/media/video/cx88/Makefile
@@ -9,21 +9,12 @@
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)
--- linux-2.6.15-rc2-git6.orig/drivers/media/video/saa7134/Makefile
+++ linux-2.6.15-rc2-git6/drivers/media/video/saa7134/Makefile
@@ -11,15 +11,10 @@
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_MT352),n)
- EXTRA_CFLAGS += -DHAVE_MT352=1
-endif
-ifneq ($(CONFIG_DVB_TDA1004X),n)
- EXTRA_CFLAGS += -DHAVE_TDA1004X=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_MT352) += -DHAVE_MT352=1
+extra-cflags-$(CONFIG_DVB_TDA1004X) += -DHAVE_TDA1004X=1
+extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1
+
+EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
next prev parent reply other threads:[~2005-11-26 20:30 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-20 3:40 Linux 2.6.15-rc2 Linus Torvalds
2005-11-20 5:18 ` Gene Heskett
2005-11-20 17:02 ` Gene Heskett
2005-11-20 17:37 ` Gene Heskett
2005-11-20 19:17 ` Gene Heskett
2005-11-20 22:36 ` Kasper Sandberg
2005-11-20 23:58 ` Gene Heskett
2005-11-21 21:17 ` Kasper Sandberg
2005-11-21 23:52 ` Gene Heskett
2005-11-23 9:04 ` Kasper Sandberg
2005-11-21 0:15 ` Johannes Stezenbach
2005-11-21 1:07 ` Gene Heskett
2005-11-21 1:32 ` Johannes Stezenbach
2005-11-21 1:49 ` Gene Heskett
2005-11-23 1:56 ` Michael Krufky
2005-11-23 4:36 ` Gene Heskett
2005-11-23 17:42 ` Adrian Bunk
2005-11-23 18:19 ` Gene Heskett
2005-11-23 18:26 ` Sam Ravnborg
2005-11-23 18:38 ` Adrian Bunk
2005-11-26 20:30 ` Michael Krufky [this message]
2005-11-23 18:31 ` Gene Heskett
2005-11-23 19:17 ` Michael Krufky
2005-11-23 19:36 ` Gene Heskett
2005-11-23 19:54 ` Michael Krufky
2005-11-23 20:14 ` Gene Heskett
2005-11-23 20:28 ` Michael Krufky
2005-11-23 21:26 ` Hugh Dickins
2005-11-23 22:36 ` Gene Heskett
2005-11-23 23:40 ` Hugh Dickins
2005-11-23 23:53 ` Gene Heskett
2005-11-24 0:37 ` Gene Heskett
2005-11-24 7:45 ` Hugh Dickins
2005-11-24 15:15 ` Gene Heskett
2005-11-24 17:02 ` Michael Krufky
2005-11-24 19:07 ` [PATCH] hybrid v4l/dvb advanced frontend selection fix Michael Krufky
2005-11-24 4:40 ` Linux 2.6.15-rc2 Paul Jackson
2005-11-23 20:38 ` Adrian Bunk
2005-11-23 20:49 ` Michael Krufky
2005-11-23 21:04 ` Adrian Bunk
2005-11-20 13:20 ` Michael Geithe
2005-11-20 14:52 ` cinergyT2 oops (was Re: Linux 2.6.15-rc2) Alexey Dobriyan
2005-11-20 15:04 ` Michael Geithe
2005-11-20 16:13 ` Linux 2.6.15-rc2 Dmitry Torokhov
2005-11-20 19:13 ` Michael Geithe
2005-11-22 4:30 ` Jeffrey Hundstad
2005-11-22 23:00 ` Andrew Morton
2005-11-23 0:50 ` Linus Torvalds
2005-11-23 1:05 ` Andrew Morton
2005-11-23 1:32 ` Andi Kleen
2005-11-23 1:43 ` Linus Torvalds
2005-11-23 2:16 ` David S. Miller
2005-11-23 1:39 ` Linus Torvalds
2005-11-23 2:08 ` Andrew Morton
2005-11-23 3:41 ` Jeffrey Hundstad
2005-11-23 3:48 ` Linus Torvalds
2005-11-23 16:48 ` Jeffrey Hundstad
2005-11-23 5:01 ` Zan Lynx
2005-11-23 1:14 ` Zan Lynx
2005-11-23 4:42 ` Gene Heskett
2005-11-24 12:37 ` Ed Tomlinson
2005-11-24 13:07 ` Andreas Ericsson
2005-11-24 18:44 ` Linus Torvalds
2005-11-24 19:42 ` Junio C Hamano
2005-11-24 19:57 ` Linus Torvalds
2005-11-24 21:02 ` Junio C Hamano
2005-11-24 18:37 ` Linus Torvalds
2005-11-24 19:52 ` Nick Hengeveld
2005-11-25 2:50 ` Ed Tomlinson
2005-11-25 8:42 ` Andreas Ericsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4388C5F6.70705@m1k.net \
--to=mkrufky@m1k.net \
--cc=akpm@osdl.org \
--cc=bunk@stusta.de \
--cc=gene.heskett@verizon.net \
--cc=js@linuxtv.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=sam@ravnborg.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox