summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-05-06 15:25:14 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-06 15:25:14 -0300
commit8b21bbd63b7b73b55a57f2d8b1bf2aacd2f80874 (patch)
tree24d0c872180f0f75796d8444bdeb003586d12e4a /linux/drivers/media/video/cx18
parentea036ab76194bc4f02dbb0803e4d977044636188 (diff)
parentd2e4d325373507cb36a3c4993cd675331edad4cd (diff)
downloadmediapointer-dvb-s2-8b21bbd63b7b73b55a57f2d8b1bf2aacd2f80874.tar.gz
mediapointer-dvb-s2-8b21bbd63b7b73b55a57f2d8b1bf2aacd2f80874.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx18')
-rw-r--r--linux/drivers/media/video/cx18/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/Kconfig b/linux/drivers/media/video/cx18/Kconfig
index acc4b47f1..35a55998a 100644
--- a/linux/drivers/media/video/cx18/Kconfig
+++ b/linux/drivers/media/video/cx18/Kconfig
@@ -1,10 +1,12 @@
config VIDEO_CX18
tristate "Conexant cx23418 MPEG encoder support"
depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
+ depends on INPUT # due to VIDEO_IR
+ depends on HOTPLUG # due to FW_LOADER
select I2C_ALGOBIT
select FW_LOADER
select VIDEO_IR
- select MEDIA_TUNER
+ select VIDEO_TUNER
select VIDEO_TVEEPROM
select VIDEO_CX2341X
select VIDEO_CS5345