From: mchehab@infradead.org
To: linux-kernel@vger.kernel.org
Cc: linux-dvb-maintainer@linuxtv.org,
Michael Krufky <mkrufky@linuxtv.org>,
Mauro Carvalho Chehab <mchehab@infradead.org>
Subject: [PATCH 12/21] Kconfig: select VIDEO_CX25840 to build cx25840 a/v decoder module
Date: Fri, 17 Mar 2006 17:54:36 -0300 [thread overview]
Message-ID: <20060317205436.PS11748800012@infradead.org> (raw)
In-Reply-To: <20060317205359.PS65198900000@infradead.org>
From: Michael Krufky <mkrufky@linuxtv.org>
Date: 1142307307 \-0300
The cx25840 module requires external firmware in order to function,
so it must select FW_LOADER, but saa7115 and saa7129 do not require it.
This patch creates VIDEO_CX25840, and alters VIDEO_DECODER to select it.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/Kconfig | 3 +++
drivers/media/video/Makefile | 3 ++-
drivers/media/video/cx25840/Kconfig | 9 +++++++++
drivers/media/video/cx25840/Makefile | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index d82c8a3..995f033 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -349,8 +349,11 @@ config VIDEO_AUDIO_DECODER
config VIDEO_DECODER
tristate "Add support for additional video chipsets"
depends on VIDEO_DEV && I2C && EXPERIMENTAL
+ select VIDEO_CX25840
---help---
Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
video decoders.
+source "drivers/media/video/cx25840/Kconfig"
+
endmenu
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index faf7283..d36b145 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom
obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
-obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840/ saa7127.o
+obj-$(CONFIG_VIDEO_DECODER) += saa7115.o saa7127.o
+obj-$(CONFIG_VIDEO_CX25840) += cx25840/
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
diff --git a/drivers/media/video/cx25840/Kconfig b/drivers/media/video/cx25840/Kconfig
new file mode 100644
index 0000000..854264e
--- /dev/null
+++ b/drivers/media/video/cx25840/Kconfig
@@ -0,0 +1,9 @@
+config VIDEO_CX25840
+ tristate "Conexant CX2584x audio/video decoders"
+ depends on VIDEO_DEV && I2C && EXPERIMENTAL
+ select FW_LOADER
+ ---help---
+ Support for the Conexant CX2584x audio/video decoders.
+
+ To compile this driver as a module, choose M here: the
+ module will be called cx25840
diff --git a/drivers/media/video/cx25840/Makefile b/drivers/media/video/cx25840/Makefile
index 543ebac..32a896c 100644
--- a/drivers/media/video/cx25840/Makefile
+++ b/drivers/media/video/cx25840/Makefile
@@ -1,6 +1,6 @@
cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
cx25840-vbi.o
-obj-$(CONFIG_VIDEO_DECODER) += cx25840.o
+obj-$(CONFIG_VIDEO_CX25840) += cx25840.o
EXTRA_CFLAGS += -I$(src)/..
next prev parent reply other threads:[~2006-03-17 20:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-17 20:53 [PATCH 00/21] V4L/DVB fixes mchehab
2006-03-17 20:54 ` [PATCH 01/21] Nskips maybe used uninitialized in bttv_risc_overlay mchehab
2006-03-17 20:54 ` [PATCH 03/21] Correct gpio values for Aver 303 Studio in v4l-dvb tree mchehab
2006-03-17 20:54 ` [PATCH 04/21] Fix typo in enum name and use enum in struct dmxdev_filter mchehab
2006-03-17 20:54 ` [PATCH 02/21] Fix cx88 error messages on balance change mchehab
2006-03-17 20:54 ` [PATCH 05/21] Added no_overlay option and quirks to saa7134 mchehab
2006-03-17 23:24 ` Adrian Bunk
2006-03-18 0:04 ` [v4l-dvb-maintainer] " Mauro Carvalho Chehab
2006-03-17 20:54 ` [PATCH 07/21] Cx88-input.c: add IR remote control support to CX88_BOARD_PROLINK_PLAYTVPVR mchehab
2006-03-17 20:54 ` [PATCH 06/21] Cx88-cards.c: fix values of gpio0 for card CX88_BOARD_PROLINK_PLAYTVPVR mchehab
2006-03-17 20:54 ` [PATCH 11/21] Snd_cx88_create: don't dereference NULL core mchehab
2006-03-17 20:54 ` [PATCH 09/21] Cleanup mangled whitespace mchehab
2006-03-17 20:54 ` [PATCH 08/21] Cx88 default picture controls values mchehab
2006-03-17 21:10 ` Lee Revell
2006-03-18 0:25 ` Mauro Carvalho Chehab
2006-03-17 20:54 ` [PATCH 10/21] BUG_ON() Conversion in drivers/video/media mchehab
2006-03-17 20:54 ` mchehab [this message]
2006-03-17 20:54 ` [PATCH 14/21] Cinergy T2 dmx cleanup on disconnect mchehab
2006-03-17 20:54 ` [PATCH 13/21] Whitespace: fix incorrect indentation of curly bracket mchehab
2006-03-17 20:54 ` [PATCH 17/21] Kconfig: fix ATSC frontend menu item names by manufacturer mchehab
2006-03-17 20:54 ` [PATCH 16/21] Kconfig: swap VIDEO_CX88_ALSA and VIDEO_CX88_DVB mchehab
2006-03-18 19:59 ` Michael Krufky
2006-03-18 20:15 ` [2.6.16 PATCH] " Michael Krufky
2006-03-17 20:54 ` [PATCH 15/21] Restore tuning capabilities in v4l2 mxb driver mchehab
2006-03-17 20:54 ` [PATCH 18/21] Fix a bug when more than MAXBOARDS were plugged on em28xx mchehab
2006-03-17 20:54 ` [PATCH 19/21] Cpia2: move Kconfig build logic into cpia2/Kconfig mchehab
2006-03-17 20:54 ` [PATCH 20/21] VIDEO_CPIA2 must depend on USB mchehab
2006-03-17 20:54 ` [PATCH 21/21] Fixed em28xx based system lockup mchehab
2006-03-17 23:07 ` [PATCH 00/21] V4L/DVB fixes Linus Torvalds
2006-03-17 23:13 ` Mauro Carvalho Chehab
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=20060317205436.PS11748800012@infradead.org \
--to=mchehab@infradead.org \
--cc=linux-dvb-maintainer@linuxtv.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkrufky@linuxtv.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
all inboxes | Powered by JetHome®