aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-06-28 22:53:51 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:23:47 -0400
commit14a638cd3b6031c27b33560506244b9bf1913ad9 (patch)
tree07874c38f0c5c240d661246ea7b5873a2a4de74e /drivers/media/dvb
parenteb383bddc5ec52087ccfad4cccd8c6cc57c846d8 (diff)
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')
-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 @@
3# 3#
4 4
5config DVB_SIANO_SMS1XXX 5config DVB_SIANO_SMS1XXX
6 tristate "Siano SMS1xxx USB dongle support" 6 tristate "Siano SMS1XXX USB dongle support"
7 depends on DVB_CORE && USB 7 depends on DVB_CORE && USB
8 ---help--- 8 ---help---
9 Choose Y here if you have USB dongle with SMS1xxx chipset. 9 Choose Y here if you have a USB dongle with a SMS1XXX chipset.
10
11 Further documentation on this driver can be found on the WWW at
12 <http://www.siano-ms.com/>.
13 10
14 To compile this driver as a module, choose M here: the 11 To compile this driver as a module, choose M here: the
15 module will be called sms1xxx. 12 module will be called sms1xxx.
16 13
14config DVB_SIANO_SMS1XXX_SMS_IDS
15 bool "Enable support for Siano Mobile Silicon default USB IDs"
16 depends on DVB_SIANO_SMS1XXX
17 default y
18 ---help---
19 Choose Y here if you have a USB dongle with a SMS1XXX chipset
20 that uses Siano Mobile Silicon's default usb vid:pid.
21
22 Choose N here if you would prefer to use Siano's external driver.
23
24 Further documentation on this driver can be found on the WWW at
25 <http://www.siano-ms.com/>.
26
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 @@
20#include "sms-cards.h" 20#include "sms-cards.h"
21 21
22struct usb_device_id smsusb_id_table[] = { 22struct usb_device_id smsusb_id_table[] = {
23#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS
23 { USB_DEVICE(0x187f, 0x0010), 24 { USB_DEVICE(0x187f, 0x0010),
24 .driver_info = SMS1XXX_BOARD_SIANO_STELLAR }, 25 .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
25 { USB_DEVICE(0x187f, 0x0100), 26 { USB_DEVICE(0x187f, 0x0100),
@@ -30,6 +31,7 @@ struct usb_device_id smsusb_id_table[] = {
30 .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B }, 31 .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
31 { USB_DEVICE(0x187f, 0x0300), 32 { USB_DEVICE(0x187f, 0x0300),
32 .driver_info = SMS1XXX_BOARD_SIANO_VEGA }, 33 .driver_info = SMS1XXX_BOARD_SIANO_VEGA },
34#endif
33 { } /* Terminating entry */ 35 { } /* Terminating entry */
34}; 36};
35MODULE_DEVICE_TABLE(usb, smsusb_id_table); 37MODULE_DEVICE_TABLE(usb, smsusb_id_table);