diff mbox

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

Message ID 53EBA5E3.4060104@infradead.org (mailing list archive)
State New, archived
Headers show

Commit Message

Randy Dunlap Aug. 13, 2014, 5:52 p.m. UTC 
From: Randy Dunlap <rdunlap@infradead.org>

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'

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Jim Davis <jim.epost@gmail.com>
Cc: Holger Waechtler <holger@convergence.de>
Cc: Oliver Endriss <o.endriss@gmx.de>
---
 drivers/media/pci/ttpci/Kconfig  |    4 ++++
 drivers/media/pci/ttpci/Makefile |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

Index: linux-next-20140813/drivers/media/pci/ttpci/Kconfig
===================================================================
--- linux-next-20140813.orig/drivers/media/pci/ttpci/Kconfig
+++ 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
Index: linux-next-20140813/drivers/media/pci/ttpci/Makefile
===================================================================
--- linux-next-20140813.orig/drivers/media/pci/ttpci/Makefile
+++ 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