diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-20 01:59:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-20 01:59:48 -0700 |
| commit | 5eeaa2db162f1f6d83e988d4d28f4ba7be600e44 (patch) | |
| tree | 440e245201485fcfb7858bf57aae755c00b15651 /drivers/bluetooth/btusb.c | |
| parent | c5e90f562047ff9713183cf5e18f5e8997bc7373 (diff) | |
| parent | c64557d666eb62eb5f296c6b93bd0a5525ed1e36 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index d22ce3cc611e..d120a5c1c093 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -59,9 +59,15 @@ static struct usb_device_id btusb_table[] = { /* Generic Bluetooth USB device */ { USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, + /* Apple MacBookPro 7,1 */ + { USB_DEVICE(0x05ac, 0x8213) }, + /* Apple iMac11,1 */ { USB_DEVICE(0x05ac, 0x8215) }, + /* Apple MacBookPro6,2 */ + { USB_DEVICE(0x05ac, 0x8218) }, + /* AVM BlueFRITZ! USB v2.0 */ { USB_DEVICE(0x057c, 0x3800) }, |