aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/siano
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-06-28 23:53:51 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 07:23:47 -0300
commit14a638cd3b6031c27b33560506244b9bf1913ad9 (patch)
tree07874c38f0c5c240d661246ea7b5873a2a4de74e /drivers/media/dvb/siano
parentV4L/DVB (8307): sms1xxx: change smsusb_driver.name to sms1xxx (diff)
downloadlinux-dev-14a638cd3b6031c27b33560506244b9bf1913ad9.tar.xz
linux-dev-14a638cd3b6031c27b33560506244b9bf1913ad9.zip
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>
Diffstat (limited to 'drivers/media/dvb/siano')
-rw-r--r--drivers/media/dvb/siano/Kconfig20
-rw-r--r--drivers/media/dvb/siano/sms-cards.c2
2 files changed, 17 insertions, 5 deletions
diff --git a/drivers/media/dvb/siano/Kconfig b/drivers/media/dvb/siano/Kconfig
index 878d48c1cfc0..dd863f261672 100644
--- 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 6a22ec10fe20..c4c9ab0232e3 100644
--- 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);