Commit cfec93f7 authored Aug 09, 2010 by Mauro Carvalho Chehab

V4L/DVB: Fix IR_CORE dependencies



As pointed by Randy Dunlap <randy.dunlap@oracle.com>:
> ERROR: "ir_keydown" [drivers/media/video/ir-kbd-i2c.ko] undefined!
> ERROR: "__ir_input_register" [drivers/media/video/ir-kbd-i2c.ko] undefined!
> ERROR: "get_rc_map" [drivers/media/video/ir-kbd-i2c.ko] undefined!
> ERROR: "ir_input_unregister" [drivers/media/video/ir-kbd-i2c.ko] undefined!
> ERROR: "get_rc_map" [drivers/media/video/cx88/cx88xx.ko] undefined!
> ERROR: "ir_repeat" [drivers/media/video/cx88/cx88xx.ko] undefined!
> ERROR: "ir_input_unregister" [drivers/media/video/cx88/cx88xx.ko] undefined!
> ERROR: "ir_keydown" [drivers/media/video/cx88/cx88xx.ko] undefined!
> ERROR: "__ir_input_register" [drivers/media/video/cx88/cx88xx.ko] undefined!
> ERROR: "get_rc_map" [drivers/media/video/bt8xx/bttv.ko] undefined!
> ERROR: "ir_input_unregister" [drivers/media/video/bt8xx/bttv.ko] undefined!
> ERROR: "__ir_input_register" [drivers/media/video/bt8xx/bttv.ko] undefined!
> ERROR: "ir_g_keycode_from_table" [drivers/media/IR/ir-common.ko] undefined!
>
>
> #5101:
> (.text+0x8306e2): undefined reference to `ir_core_debug'
> (.text+0x830729): undefined reference to `ir_core_debug'
> ir-functions.c:(.text+0x830906): undefined reference to `ir_core_debug'
> (.text+0x8309d8): undefined reference to `ir_g_keycode_from_table'
> (.text+0x830acf): undefined reference to `ir_core_debug'
> (.text+0x830b92): undefined reference to `ir_core_debug'
> (.text+0x830bef): undefined reference to `ir_core_debug'
> (.text+0x830c6a): undefined reference to `ir_core_debug'
> (.text+0x830cf7): undefined reference to `ir_core_debug'
> budget-ci.c:(.text+0x89f5c8): undefined reference to `ir_keydown'
> budget-ci.c:(.text+0x8a0c58): undefined reference to `get_rc_map'
> budget-ci.c:(.text+0x8a0c80): undefined reference to `__ir_input_register'
> budget-ci.c:(.text+0x8a0ee0): undefined reference to `get_rc_map'
> budget-ci.c:(.text+0x8a11cd): undefined reference to `ir_input_unregister'
> (.text+0x8a8adb): undefined reference to `ir_input_unregister'
> dvb-usb-remote.c:(.text+0x8a9188): undefined reference to `get_rc_map'
> dvb-usb-remote.c:(.text+0x8a91b1): undefined reference to `__ir_input_register'
> dvb-usb-remote.c:(.text+0x8a9238): undefined reference to `get_rc_map'
> dib0700_core.c:(.text+0x8b04ca): undefined reference to `ir_keydown'
> dib0700_devices.c:(.text+0x8b2ea8): undefined reference to `ir_keydown'
> dib0700_devices.c:(.text+0x8b2ef0): undefined reference to `ir_keydown'

Those breakages seem to be caused by two bad things at IR_CORE Kconfig:

1) cx23885 is using select for IR_CORE;
2) the dvb-usb and sms dependency for IR_CORE were missing.

While here, allow users to un-select IR.

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 560afa7d

drivers/media/IR/Kconfig

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,14 +2,21 @@ menuconfig IR_CORE
	tristate "Infrared remote controller adapters"		tristate "Infrared remote controller adapters"
	depends on INPUT		depends on INPUT
	default INPUT		default INPUT
			---help---
			Enable support for Remote Controllers on Linux. This is
			needed in order to support several video capture adapters.

	if IR_CORE		Enable this option if you have a video capture board even
			if you don't need IR, as otherwise, you may not be able to
			compile the driver for your adapter.

	config VIDEO_IR		config VIDEO_IR
	tristate		tristate
	depends on IR_CORE		depends on IR_CORE
	default IR_CORE		default IR_CORE

			if IR_CORE

	config LIRC		config LIRC
	tristate		tristate
	default y		default y

drivers/media/dvb/dvb-usb/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	config DVB_USB		config DVB_USB
	tristate "Support for various USB DVB devices"		tristate "Support for various USB DVB devices"
	depends on DVB_CORE && USB && I2C && INPUT		depends on DVB_CORE && USB && I2C && IR_CORE
	help		help
	By enabling this you will be able to choose the various supported		By enabling this you will be able to choose the various supported
	USB1.1 and USB2.0 DVB devices.		USB1.1 and USB2.0 DVB devices.

drivers/media/dvb/siano/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@

	config SMS_SIANO_MDTV		config SMS_SIANO_MDTV
	tristate "Siano SMS1xxx based MDTV receiver"		tristate "Siano SMS1xxx based MDTV receiver"
	depends on DVB_CORE && INPUT && HAS_DMA		depends on DVB_CORE && IR_CORE && HAS_DMA
	---help---		---help---
	Choose Y or M here if you have MDTV receiver with a Siano chipset.		Choose Y or M here if you have MDTV receiver with a Siano chipset.

drivers/media/video/cx23885/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@ config VIDEO_CX23885
	select VIDEO_BTCX		select VIDEO_BTCX
	select VIDEO_TUNER		select VIDEO_TUNER
	select VIDEO_TVEEPROM		select VIDEO_TVEEPROM
	select IR_CORE		depends on IR_CORE
	select VIDEOBUF_DVB		select VIDEOBUF_DVB
	select VIDEOBUF_DMA_SG		select VIDEOBUF_DMA_SG
	select VIDEO_CX25840		select VIDEO_CX25840