提交 2c4e11b7 编写于 作者: M Mauro Carvalho Chehab

[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 fdd1eeb4 "[media] siano: allow compiling it without RC support"
And it happens when CONFIG_SMS_SIANO_RC=y and CONFIG_RC_CORE=m .
Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
Reported-by: NAntti Palosaari <crope@iki.fi>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 68620bdd
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
config SMS_SIANO_MDTV config SMS_SIANO_MDTV
tristate tristate
depends on DVB_CORE && HAS_DMA depends on DVB_CORE && HAS_DMA
depends on !RC_CORE || RC_CORE
depends on SMS_USB_DRV || SMS_SDIO_DRV depends on SMS_USB_DRV || SMS_SDIO_DRV
default y default y
......
smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o
obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.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 += -Idrivers/media/dvb-core
ccflags-y += $(extra-cflags-y) $(extra-cflags-m) ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
config SMS_SDIO_DRV config SMS_SDIO_DRV
tristate "Siano SMS1xxx based MDTV via SDIO interface" 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 depends on MMC
select MEDIA_COMMON_OPTIONS select MEDIA_COMMON_OPTIONS
---help--- ---help---
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
config SMS_USB_DRV config SMS_USB_DRV
tristate "Siano SMS1xxx based MDTV receiver" tristate "Siano SMS1xxx based MDTV receiver"
depends on DVB_CORE && RC_CORE && HAS_DMA depends on DVB_CORE && HAS_DMA
select MEDIA_COMMON_OPTIONS select MEDIA_COMMON_OPTIONS
---help--- ---help---
Choose if you would like to have Siano's support for USB interface Choose if you would like to have Siano's support for USB interface
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册