From f1baf286ee21aa937f0b8074c8e96a1489e5209d Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 7 Nov 2012 11:09:08 +0100
Subject: [PATCH] --- yaml --- r: 343899 b: refs/heads/master c:
 2c4e11b7c15af70580625657a154ea7ea70b8c76 h: refs/heads/master i:   343897:
 4208d3adfdd321de45d147be3e3bba2eb9efe543   343895:
 615e0d4f32fc0372c78cc51055121cfa0994ad33 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/common/siano/Kconfig  | 1 +
 trunk/drivers/media/common/siano/Makefile | 5 ++++-
 trunk/drivers/media/mmc/siano/Kconfig     | 2 +-
 trunk/drivers/media/usb/siano/Kconfig     | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 253c5d2fc756..0fd4ab4e3117 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68620bdd10c319fd292ea442130793eb2f2ab293
+refs/heads/master: 2c4e11b7c15af70580625657a154ea7ea70b8c76
diff --git a/trunk/drivers/media/common/siano/Kconfig b/trunk/drivers/media/common/siano/Kconfig
index 3cb7823ab31b..68f0f604678e 100644
--- a/trunk/drivers/media/common/siano/Kconfig
+++ b/trunk/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/trunk/drivers/media/common/siano/Makefile b/trunk/drivers/media/common/siano/Makefile
index 0e6f5e927137..9e7fdf24a6b7 100644
--- a/trunk/drivers/media/common/siano/Makefile
+++ b/trunk/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/trunk/drivers/media/mmc/siano/Kconfig b/trunk/drivers/media/mmc/siano/Kconfig
index 69f8061602a4..aa05ad3c1ccb 100644
--- a/trunk/drivers/media/mmc/siano/Kconfig
+++ b/trunk/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/trunk/drivers/media/usb/siano/Kconfig b/trunk/drivers/media/usb/siano/Kconfig
index b2c229e73952..5afbd9a4b55c 100644
--- a/trunk/drivers/media/usb/siano/Kconfig
+++ b/trunk/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