linux-next: manual merge of the bluetooth tree with Linus' tree

[Stephen Rothwell]

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
drivers/bluetooth/btusb.c between commit 3c49aa852e00 ("Revert
"Bluetooth: Enable autosuspend for Intel Bluetooth device"") from
Linus' tree and commit 10d4c6736ea6 ("Bluetooth: btusb: Add Broadcom
patch RAM support") from the bluetooth tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/bluetooth/btusb.c
index a7dfbf9a3afb,8f579cd9bbaf..000000000000
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -1486,8 -1635,13 +1636,11 @@@ static int btusb_probe(struct usb_inter
  	if (id->driver_info & BTUSB_BCM92035)
  		hdev->setup = btusb_setup_bcm92035;
  
+ 	if (id->driver_info & BTUSB_BCM_PATCHRAM)
+ 		hdev->setup = btusb_setup_bcm_patchram;
+ 
 -	if (id->driver_info & BTUSB_INTEL) {
 -		usb_enable_autosuspend(data->udev);
 +	if (id->driver_info & BTUSB_INTEL)
  		hdev->setup = btusb_setup_intel;
 -	}
  
  	/* Interface numbers are hardcoded in the specification */
  	data->isoc = usb_ifnum_to_if(data->udev, 1);

Attachment: signature.asc
Description: PGP signature