diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
| commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
| tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /drivers/bluetooth/hci_usb.c | |
| parent | 825f9075d74028d11d7f5932f04e1b5db3022b51 (diff) | |
| parent | d834c16516d1ebec4766fc58c059bf01311e6045 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/bluetooth/hci_usb.c')
| -rw-r--r-- | drivers/bluetooth/hci_usb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index e2d4beac7420..0801af4ad2b9 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c | |||
| @@ -96,6 +96,9 @@ static struct usb_device_id bluetooth_ids[] = { | |||
| 96 | /* Ericsson with non-standard id */ | 96 | /* Ericsson with non-standard id */ |
| 97 | { USB_DEVICE(0x0bdb, 0x1002) }, | 97 | { USB_DEVICE(0x0bdb, 0x1002) }, |
| 98 | 98 | ||
| 99 | /* Canyon CN-BTU1 with HID interfaces */ | ||
| 100 | { USB_DEVICE(0x0c10, 0x0000), .driver_info = HCI_RESET }, | ||
| 101 | |||
| 99 | { } /* Terminating entry */ | 102 | { } /* Terminating entry */ |
| 100 | }; | 103 | }; |
| 101 | 104 | ||