From 14a638cd3b6031c27b33560506244b9bf1913ad9 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sat, 28 Jun 2008 23:53:51 -0300 Subject: 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 Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb/siano/Kconfig | 20 +++++++++++++++----- drivers/media/dvb/siano/sms-cards.c | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'drivers/media/dvb') diff --git a/drivers/media/dvb/siano/Kconfig b/drivers/media/dvb/siano/Kconfig index 878d48c1cfc..dd863f26167 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 - . + 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 + . + diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c index 6a22ec10fe2..c4c9ab0232e 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); -- cgit v1.2.3