lkml.org 
[lkml]   [2012]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm tree with the wireless tree
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@canb.auug.org.au

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 */
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-02-16 06:09    [W:1.483 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site