Merge commit 'v2.6.31-rc9' into tracing/core

Merge reason: move from -rc5 to -rc9.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 24 insertions, 16 deletions

diff --git a/drivers/media/dvb/siano/Kconfig b/drivers/media/dvb/siano/Kconfig
index dd863f261672..8c1aed77ea30 100644
--- a/drivers/media/dvb/siano/Kconfig
+++ b/drivers/media/dvb/siano/Kconfig
@@ -2,25 +2,33 @@
 # Siano Mobile Silicon Digital TV device configuration
 #
 
-config DVB_SIANO_SMS1XXX
-        tristate "Siano SMS1XXX USB dongle support"
-        depends on DVB_CORE && USB
+config SMS_SIANO_MDTV
+        tristate "Siano SMS1xxx based MDTV receiver"
+        depends on DVB_CORE && INPUT
         ---help---
-          Choose Y here if you have a USB dongle with a SMS1XXX chipset.
+          Choose Y or M here if you have MDTV receiver with a Siano chipset.
 
-          To compile this driver as a module, choose M here: the
-          module will be called sms1xxx.
+          To compile this driver as a module, choose M here
+          (The module will be called smsmdtv).
 
-config DVB_SIANO_SMS1XXX_SMS_IDS
-        bool "Enable support for Siano Mobile Silicon default USB IDs"
-        depends on DVB_SIANO_SMS1XXX
-        default y
-        ---help---
-          Choose Y here if you have a USB dongle with a SMS1XXX chipset
-          that uses Siano Mobile Silicon's default usb vid:pid.
+          Further documentation on this driver can be found on the WWW
+          at http://www.siano-ms.com/
+
+if SMS_SIANO_MDTV
+menu "Siano module components"
 
-          Choose N here if you would prefer to use Siano's external driver.
+# Hardware interfaces support
 
-          Further documentation on this driver can be found on the WWW at
-          <http://www.siano-ms.com/>.
+config SMS_USB_DRV
+        tristate "USB interface support"
+        depends on DVB_CORE && USB
+        ---help---
+          Choose if you would like to have Siano's support for USB interface
 
+config SMS_SDIO_DRV
+        tristate "SDIO interface support"
+        depends on DVB_CORE && MMC
+        ---help---
+          Choose if you would like to have Siano's support for SDIO interface
+endmenu
+endif # SMS_SIANO_MDTV