summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-05-14 05:08:19 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-14 02:56:47 -0300
commitc2b7bbea83b239b1877f3cafe0cdcbbd08e65648 (patch)
tree131fbb1b98d948908268d8252c97848a4f81c44d
parent2ea336dc117098ef917ca9a19e911d15490587cc (diff)
downloadlinux-stable-c2b7bbea83b239b1877f3cafe0cdcbbd08e65648.tar.gz
linux-stable-c2b7bbea83b239b1877f3cafe0cdcbbd08e65648.tar.bz2
linux-stable-c2b7bbea83b239b1877f3cafe0cdcbbd08e65648.zip
V4L/DVB (7900): pvrusb: Fix Kconfig if DVB=m V4L_core=y
As reported by Ingo Molnar: x86.git testing found the following build failure: drivers/built-in.o: In function `pvr2_dvb_feed_thread': pvrusb2-dvb.c:(.text+0x127e78): undefined reference to `dvb_dmx_swfilter' drivers/built-in.o: In function `pvr2_dvb_adapter_exit': pvrusb2-dvb.c:(.text+0x128357): undefined reference to `dvb_net_release' pvrusb2-dvb.c:(.text+0x12836f): undefined reference to `dvb_dmxdev_release' [...] with this config: CONFIG_VIDEO_PVRUSB2=y CONFIG_DVB_CORE=m i.e. pvrusb2 is built-in, dvb-core is modular. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/pvrusb2/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index e2a7a508c2e9..4482b2c72ced 100644
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -1,6 +1,7 @@
config VIDEO_PVRUSB2
tristate "Hauppauge WinTV-PVR USB2 support"
depends on VIDEO_V4L2 && I2C
+ depends on VIDEO_MEDIA # Avoids pvrusb = Y / DVB = M
depends on HOTPLUG # due to FW_LOADER
select FW_LOADER
select VIDEO_TUNER