diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /drivers/bluetooth | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 411ae9c9b384..7e0ebd4a1a74 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
| @@ -1043,8 +1043,6 @@ static int btusb_probe(struct usb_interface *intf, | |||
| 1043 | 1043 | ||
| 1044 | usb_set_intfdata(intf, data); | 1044 | usb_set_intfdata(intf, data); |
| 1045 | 1045 | ||
| 1046 | usb_enable_autosuspend(interface_to_usbdev(intf)); | ||
| 1047 | |||
| 1048 | return 0; | 1046 | return 0; |
| 1049 | } | 1047 | } |
| 1050 | 1048 | ||