diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-10 22:15:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-10 22:15:31 -0800 |
| commit | 8877870f8a8127b653f8c9a55c6b4de9f96f639b (patch) | |
| tree | cc2629911f6b011ee2e3f4a85febbb9b6cc63604 /drivers/bluetooth/btusb.c | |
| parent | 7a1abd08d52fdeddb3e9a5a33f2f15cc6a5674d2 (diff) | |
| parent | 7379efeacb707f49729080791a7a562d8996aec4 (diff) | |
| download | op-kernel-dev-8877870f8a8127b653f8c9a55c6b4de9f96f639b.zip op-kernel-dev-8877870f8a8127b653f8c9a55c6b4de9f96f639b.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index d120a5c..ab3894f 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -68,6 +68,9 @@ static struct usb_device_id btusb_table[] = { /* Apple MacBookPro6,2 */ { USB_DEVICE(0x05ac, 0x8218) }, + /* Apple MacBookAir3,1, MacBookAir3,2 */ + { USB_DEVICE(0x05ac, 0x821b) }, + /* AVM BlueFRITZ! USB v2.0 */ { USB_DEVICE(0x057c, 0x3800) }, @@ -1029,6 +1032,8 @@ static int btusb_probe(struct usb_interface *intf, usb_set_intfdata(intf, data); + usb_enable_autosuspend(interface_to_usbdev(intf)); + return 0; } |
