---

yaml --- r: 343899 b: refs/heads/master c: 2c4e11b h: refs/heads/master i: 343897: 4208d3a 343895: 615e0d4 v: v3
git-mirror · Nov 7, 2012 · f1baf28 · f1baf28
1 parent a7c012c
commit f1baf28
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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