[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>

diff --git a/drivers/media/common/siano/Kconfig b/drivers/media/common/siano/Kconfig
index 3cb7823ab31bda9e675a5677d1fe100983d198fc..68f0f604678ecd33e197539001c0097b6156fd43 100644 (file)
--- 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 0e6f5e9271371b8dc25969300f6eaffbc56592b7..9e7fdf24a6b79d4fcd8727a56a1d28aa6b164bb1 100644 (file)
--- 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 69f8061602a4ad822cc615af63241637c158a843..aa05ad3c1ccbedee60bcbece92e4acda8322ee17 100644 (file)
--- 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 b2c229e73952f701dbb44f51c6e784dc81454318..5afbd9a4b55c985f2cbf3b118060767ebebb4f9c 100644 (file)
--- 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