diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-11-07 11:09:08 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-11-07 11:09:08 +0100 |
| commit | 2c4e11b7c15af70580625657a154ea7ea70b8c76 (patch) | |
| tree | 2369c7d134659992fccc8bb09e02932307d7cf5d /drivers/media | |
| parent | 68620bdd10c319fd292ea442130793eb2f2ab293 (diff) | |
| download | linux-2c4e11b7c15af70580625657a154ea7ea70b8c76.tar.gz linux-2c4e11b7c15af70580625657a154ea7ea70b8c76.tar.bz2 linux-2c4e11b7c15af70580625657a154ea7ea70b8c76.zip | |
[media] siano: fix RC compilation
As reported by Antti and by Stephen:
drivers/built-in.o: In function `sms_ir_event':
/home/david/checkouts/linux/drivers/media/common/siano/smsir.c:48: undefined reference to `ir_raw_event_store'
/home/david/checkouts/linux/drivers/media/common/siano/smsir.c:50: undefined reference to `ir_raw_event_handle'
drivers/built-in.o: In function `sms_ir_init':
/home/david/checkouts/linux/drivers/media/common/siano/smsir.c:56: undefined reference to `smscore_get_board_id'
/home/david/checkouts/linux/drivers/media/common/siano/smsir.c:60: undefined reference to `rc_allocate_device'
/home/david/checkouts/linux/drivers/media/common/siano/smsir.c:72: undefined reference to `sms_get_board'
/home/david/checkouts/linux/drivers/media/common/siano/smsir.c:92: undefined reference to `sms_get_board'
/home/david/checkouts/linux/drivers/media/common/siano/smsir.c:97: undefined reference to `rc_register_device'
/home/david/checkouts/linux/drivers/media/common/siano/smsir.c:100: undefined reference to `rc_free_device'
drivers/built-in.o: In function `sms_ir_exit':
/home/david/checkouts/linux/drivers/media/common/siano/smsir.c:111: undefined reference to `rc_unregister_device'
make: *** [vmlinux] Error 1
Caused by commit fdd1eeb49d36 "[media] siano: allow compiling it without RC support"
And it happens when CONFIG_SMS_SIANO_RC=y and CONFIG_RC_CORE=m .
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/common/siano/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/media/common/siano/Makefile | 5 | ||||
| -rw-r--r-- | drivers/media/mmc/siano/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/usb/siano/Kconfig | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/drivers/media/common/siano/Kconfig b/drivers/media/common/siano/Kconfig index 3cb7823ab31b..68f0f604678e 100644 --- a/drivers/media/common/siano/Kconfig +++ b/drivers/media/common/siano/Kconfig @@ -5,6 +5,7 @@ config SMS_SIANO_MDTV tristate depends on DVB_CORE && HAS_DMA + depends on !RC_CORE || RC_CORE depends on SMS_USB_DRV || SMS_SDIO_DRV default y diff --git a/drivers/media/common/siano/Makefile b/drivers/media/common/siano/Makefile index 0e6f5e927137..9e7fdf24a6b7 100644 --- a/drivers/media/common/siano/Makefile +++ b/drivers/media/common/siano/Makefile @@ -1,7 +1,10 @@ smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o -obj-$(CONFIG_SMS_SIANO_RC) += smsir.o + +ifeq ($(CONFIG_SMS_SIANO_RC),y) + obj-$(CONFIG_SMS_SIANO_MDTV) += smsir.o +endif ccflags-y += -Idrivers/media/dvb-core ccflags-y += $(extra-cflags-y) $(extra-cflags-m) diff --git a/drivers/media/mmc/siano/Kconfig b/drivers/media/mmc/siano/Kconfig index 69f8061602a4..aa05ad3c1ccb 100644 --- a/drivers/media/mmc/siano/Kconfig +++ b/drivers/media/mmc/siano/Kconfig @@ -4,7 +4,7 @@ config SMS_SDIO_DRV tristate "Siano SMS1xxx based MDTV via SDIO interface" - depends on DVB_CORE && RC_CORE && HAS_DMA + depends on DVB_CORE && HAS_DMA depends on MMC select MEDIA_COMMON_OPTIONS ---help--- diff --git a/drivers/media/usb/siano/Kconfig b/drivers/media/usb/siano/Kconfig index b2c229e73952..5afbd9a4b55c 100644 --- a/drivers/media/usb/siano/Kconfig +++ b/drivers/media/usb/siano/Kconfig @@ -4,7 +4,7 @@ config SMS_USB_DRV tristate "Siano SMS1xxx based MDTV receiver" - depends on DVB_CORE && RC_CORE && HAS_DMA + depends on DVB_CORE && HAS_DMA select MEDIA_COMMON_OPTIONS ---help--- Choose if you would like to have Siano's support for USB interface |