4 files changed, 7 insertions, 3 deletions

diff --git a/drivers/media/common/siano/Kconfig b/drivers/media/common/siano/Kconfig
index 3cb7823ab31..68f0f604678 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 0e6f5e92713..9e7fdf24a6b 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 69f8061602a..aa05ad3c1cc 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 b2c229e7395..5afbd9a4b55 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