V4L/DVB (8308): sms1xxx: Provide option to support Siano default usb ids

Provide an option to enable / disable support for Siano's default usb ids.

This allows the support for Siano's USB IDs to be disabled, so that Siano's
external driver can be used, instead.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

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/>.
+

diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index 6a22ec10fe2023302ab737ddb4386b9c8d5d641b..c4c9ab0232e32af1cd8841accb344007bdc98250 100644 (file)
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -20,6 +20,7 @@
 #include "sms-cards.h"
 
 struct usb_device_id smsusb_id_table[] = {
+#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS
        { USB_DEVICE(0x187f, 0x0010),
                .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
        { USB_DEVICE(0x187f, 0x0100),
@@ -30,6 +31,7 @@ struct usb_device_id smsusb_id_table[] = {
                .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
        { USB_DEVICE(0x187f, 0x0300),
                .driver_info = SMS1XXX_BOARD_SIANO_VEGA },
+#endif
        { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, smsusb_id_table);