diff options
author | Randy Dunlap <rdunlap@infradead.org> | 2014-08-15 20:15:53 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 16:25:38 -0400 |
commit | b250392f7b5062cf026b1423e27265e278fd6b30 (patch) | |
tree | 181e5f0a6e27c8eca8129a4e850efed6fd74a2b8 | |
parent | 85c1abcb5251673d18325576f4923bb78af479de (diff) |
[media] media: ttpci: fix av7110 build to be compatible with CONFIG_INPUT_EVDEV
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/built-in.o: In function `av7110_detach':
av7110.c:(.text+0x228d4a): undefined reference to `av7110_ir_exit'
drivers/built-in.o: In function `arm_thread':
av7110.c:(.text+0x22a404): undefined reference to `av7110_check_ir_config'
av7110.c:(.text+0x22a626): undefined reference to `av7110_check_ir_config'
drivers/built-in.o: In function `av7110_attach':
av7110.c:(.text+0x22b08c): undefined reference to `av7110_ir_init'
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Jim Davis <jim.epost@gmail.com>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/pci/ttpci/Kconfig | 4 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110.c | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/drivers/media/pci/ttpci/Kconfig b/drivers/media/pci/ttpci/Kconfig index 0dcb8cd77676..7b83151ed6c4 100644 --- a/drivers/media/pci/ttpci/Kconfig +++ b/drivers/media/pci/ttpci/Kconfig | |||
@@ -1,8 +1,12 @@ | |||
1 | config DVB_AV7110_IR | ||
2 | bool | ||
3 | |||
1 | config DVB_AV7110 | 4 | config DVB_AV7110 |
2 | tristate "AV7110 cards" | 5 | tristate "AV7110 cards" |
3 | depends on DVB_CORE && PCI && I2C | 6 | depends on DVB_CORE && PCI && I2C |
4 | select TTPCI_EEPROM | 7 | select TTPCI_EEPROM |
5 | select VIDEO_SAA7146_VV | 8 | select VIDEO_SAA7146_VV |
9 | select DVB_AV7110_IR if INPUT_EVDEV=y || INPUT_EVDEV=DVB_AV7110 | ||
6 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV | 10 | depends on VIDEO_DEV # dependencies of VIDEO_SAA7146_VV |
7 | select DVB_VES1820 if MEDIA_SUBDRV_AUTOSELECT | 11 | select DVB_VES1820 if MEDIA_SUBDRV_AUTOSELECT |
8 | select DVB_VES1X93 if MEDIA_SUBDRV_AUTOSELECT | 12 | select DVB_VES1X93 if MEDIA_SUBDRV_AUTOSELECT |
diff --git a/drivers/media/pci/ttpci/Makefile b/drivers/media/pci/ttpci/Makefile index 98905963ff08..49f71b1eaf14 100644 --- a/drivers/media/pci/ttpci/Makefile +++ b/drivers/media/pci/ttpci/Makefile | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | dvb-ttpci-objs := av7110_hw.o av7110_v4l.o av7110_av.o av7110_ca.o av7110.o av7110_ipack.o | 6 | dvb-ttpci-objs := av7110_hw.o av7110_v4l.o av7110_av.o av7110_ca.o av7110.o av7110_ipack.o |
7 | 7 | ||
8 | ifdef CONFIG_INPUT_EVDEV | 8 | ifdef CONFIG_DVB_AV7110_IR |
9 | dvb-ttpci-objs += av7110_ir.o | 9 | dvb-ttpci-objs += av7110_ir.o |
10 | endif | 10 | endif |
11 | 11 | ||
diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c index f38329d29daa..c1f0617a6973 100644 --- a/drivers/media/pci/ttpci/av7110.c +++ b/drivers/media/pci/ttpci/av7110.c | |||
@@ -235,7 +235,7 @@ static void recover_arm(struct av7110 *av7110) | |||
235 | 235 | ||
236 | restart_feeds(av7110); | 236 | restart_feeds(av7110); |
237 | 237 | ||
238 | #if IS_ENABLED(CONFIG_INPUT_EVDEV) | 238 | #if IS_ENABLED(CONFIG_DVB_AV7110_IR) |
239 | av7110_check_ir_config(av7110, true); | 239 | av7110_check_ir_config(av7110, true); |
240 | #endif | 240 | #endif |
241 | } | 241 | } |
@@ -268,7 +268,7 @@ static int arm_thread(void *data) | |||
268 | if (!av7110->arm_ready) | 268 | if (!av7110->arm_ready) |
269 | continue; | 269 | continue; |
270 | 270 | ||
271 | #if IS_ENABLED(CONFIG_INPUT_EVDEV) | 271 | #if IS_ENABLED(CONFIG_DVB_AV7110_IR) |
272 | av7110_check_ir_config(av7110, false); | 272 | av7110_check_ir_config(av7110, false); |
273 | #endif | 273 | #endif |
274 | 274 | ||
@@ -2725,7 +2725,7 @@ static int av7110_attach(struct saa7146_dev* dev, | |||
2725 | 2725 | ||
2726 | mutex_init(&av7110->ioctl_mutex); | 2726 | mutex_init(&av7110->ioctl_mutex); |
2727 | 2727 | ||
2728 | #if IS_ENABLED(CONFIG_INPUT_EVDEV) | 2728 | #if IS_ENABLED(CONFIG_DVB_AV7110_IR) |
2729 | av7110_ir_init(av7110); | 2729 | av7110_ir_init(av7110); |
2730 | #endif | 2730 | #endif |
2731 | printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num); | 2731 | printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num); |
@@ -2768,7 +2768,7 @@ static int av7110_detach(struct saa7146_dev* saa) | |||
2768 | struct av7110 *av7110 = saa->ext_priv; | 2768 | struct av7110 *av7110 = saa->ext_priv; |
2769 | dprintk(4, "%p\n", av7110); | 2769 | dprintk(4, "%p\n", av7110); |
2770 | 2770 | ||
2771 | #if IS_ENABLED(CONFIG_INPUT_EVDEV) | 2771 | #if IS_ENABLED(CONFIG_DVB_AV7110_IR) |
2772 | av7110_ir_exit(av7110); | 2772 | av7110_ir_exit(av7110); |
2773 | #endif | 2773 | #endif |
2774 | if (budgetpatch || av7110->full_ts) { | 2774 | if (budgetpatch || av7110->full_ts) { |