Skip to contentSkip to conversation

media: ttpci: build av7110_ir.c only when allowed by CONFIG_INPUT_EVDEV

PATCH New Randy Dunlap 1 participant 1 message Aug 13, 2014 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: ttpci: build av7110_ir.c only when allowed by CONFIG_INPUT_EVDEV

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_INPUT_EVDEV=m and DVB_AV7110=y. Only build av7110_ir.c when CONFIG_INPUT_EVDEV is compatible with CONFIG_DVB_AV7110.

Fixes these build errors:

drivers/built-in.o: In function `input_sync':
av7110_ir.c:(.text+0x1223ac): undefined reference to input_event' drivers/built-in.o: In function av7110_emit_key':
av7110_ir.c:(.text+0x12247c): undefined reference to input_event' av7110_ir.c:(.text+0x122495): undefined reference to input_event' av7110_ir.c:(.text+0x122569): undefined reference to input_event' av7110_ir.c:(.text+0x1225a7): undefined reference to input_event' drivers/built-in.o:av7110_ir.c:(.text+0x122629): more undefined references to `input_event' follow
drivers/built-in.o: In function `av7110_ir_init':
(.text+0x1227e4): undefined reference to input_allocate_device' drivers/built-in.o: In function av7110_ir_init':
(.text+0x12298f): undefined reference to input_register_device' drivers/built-in.o: In function av7110_ir_init':
(.text+0x12299e): undefined reference to input_free_device' drivers/built-in.o: In function av7110_ir_exit':
(.text+0x122a94): undefined reference to `input_unregister_device'

---
 drivers/media/pci/ttpci/Kconfig  |    4 ++++
 drivers/media/pci/ttpci/Makefile |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/media/pci/ttpci/Kconfig +4 -0
Index: linux-next-20140813/drivers/media/pci/ttpci/Kconfig
===================================================================
@@ -1,8 +1,12 @@
+config DVB_AV7110_IR
+	bool
+
 config DVB_AV7110
 	tristate "AV7110 cards"
 	depends on DVB_CORE && PCI && I2C
 	select TTPCI_EEPROM
 	select VIDEO_SAA7146_VV
+	select DVB_AV7110_IR if INPUT_EVDEV=y || INPUT_EVDEV=DVB_AV7110
 	depends on VIDEO_DEV	# dependencies of VIDEO_SAA7146_VV
 	select DVB_VES1820 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_VES1X93 if MEDIA_SUBDRV_AUTOSELECT
drivers/media/pci/ttpci/Makefile +1 -1
Index: linux-next-20140813/drivers/media/pci/ttpci/Makefile
===================================================================
@@ -5,7 +5,7 @@
 
 dvb-ttpci-objs := av7110_hw.o av7110_v4l.o av7110_av.o av7110_ca.o av7110.o av7110_ipack.o
 
-ifdef CONFIG_INPUT_EVDEV
+ifdef CONFIG_DVB_AV7110_IR
 dvb-ttpci-objs += av7110_ir.o
 endif