diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-07 20:28:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-07 20:28:46 -0700 |
| commit | c1c6c11a6860c8135fd0d923c3d49fb368889b10 (patch) | |
| tree | 7d58008c7cf943b7b6d07f5a26d59ca9e0bdab6d /drivers/bluetooth/hci_usb.c | |
| parent | 2aaab9a0ccfd2ccf1c957cc2120da8d5593955c5 (diff) | |
| parent | cfeb414537b1d7c23ba202f198fa4154cd5a4856 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'drivers/bluetooth/hci_usb.c')
| -rw-r--r-- | drivers/bluetooth/hci_usb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index c33bb59ed1fa..e397572bf574 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c @@ -62,7 +62,6 @@ #define URB_ZERO_PACKET 0 #endif -static int ignore; static int ignore_dga; static int ignore_csr; static int ignore_sniffer; @@ -74,7 +73,7 @@ static int reset; static int isoc = 2; #endif -#define VERSION "2.9" +#define VERSION "2.10" static struct usb_driver hci_usb_driver; @@ -801,7 +800,7 @@ static int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id id = match; } - if (ignore || id->driver_info & HCI_IGNORE) + if (id->driver_info & HCI_IGNORE) return -ENODEV; if (ignore_dga && id->driver_info & HCI_DIGIANSWER) @@ -1108,9 +1107,6 @@ static void __exit hci_usb_exit(void) module_init(hci_usb_init); module_exit(hci_usb_exit); -module_param(ignore, bool, 0644); -MODULE_PARM_DESC(ignore, "Ignore devices from the matching table"); - module_param(ignore_dga, bool, 0644); MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001"); |