Hi Adnrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/bluetooth/btusb.c between commit 403f048a5705 ("Bluetooth: btusb:
Add vendor specific ID (0a5c 21f3) for BCM20702A0") from the wireless
tree and commit "bluetooth: add support for BCM20702A0 [0a5c:21e6]" from
the akpm tree.
I fixed it up (see below) an can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/bluetooth/btusb.c
index 789c9b5,e618cf1..0000000
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -102,7 -102,7 +102,8 @@@ static struct usb_device_id btusb_table
/* Broadcom BCM20702A0 */
{ USB_DEVICE(0x0a5c, 0x21e3) },
+ { USB_DEVICE(0x0a5c, 0x21e6) },
+ { USB_DEVICE(0x0a5c, 0x21f3) },
{ USB_DEVICE(0x413c, 0x8197) },
{ } /* Terminating entry */
Attachment:
pgpRn_y2ta19v.pgp
Description: PGP signature
