]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (7900): pvrusb: Fix Kconfig if DVB=m V4L_core=y
authorMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 14 May 2008 08:08:19 +0000 (05:08 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 14 May 2008 05:56:47 +0000 (02:56 -0300)
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>
drivers/media/video/pvrusb2/Kconfig

index e2a7a508c2e93ae294bd095eb55f4b752a0b7ba9..4482b2c72cedb3c8a1cbe3a212b7317186615ef3 100644 (file)
@@ -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