Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / media / dvb / siano / Kconfig

diff --git a/drivers/media/dvb/siano/Kconfig b/drivers/media/dvb/siano/Kconfig
index 878d48c1cfc0ab94792b97d24b20e57e34e10dff..dd863f26167244b1fa09925b6fa4bcec6ff0b682 100644 (file)
--- a/drivers/media/dvb/siano/Kconfig
+++ b/drivers/media/dvb/siano/Kconfig
@@ -3,14 +3,24 @@
 #
 
 config DVB_SIANO_SMS1XXX
-       tristate "Siano SMS1xxx USB dongle support"
+       tristate "Siano SMS1XXX USB dongle support"
        depends on DVB_CORE && USB
        ---help---
-         Choose Y here if you have USB dongle with SMS1xxx chipset.
-
-         Further documentation on this driver can be found on the WWW at
-         <http://www.siano-ms.com/>.
+         Choose Y here if you have a USB dongle with a SMS1XXX chipset.
 
          To compile this driver as a module, choose M here: the
          module will be called sms1xxx.
 
+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.
+
+         Choose N here if you would prefer to use Siano's external driver.
+
+         Further documentation on this driver can be found on the WWW at
+         <http://www.siano-ms.com/>.
+