A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git

Browse source 
Conflicts:
	include/net/bluetooth/l2cap.h
	net/bluetooth/hci_conn.c
	net/bluetooth/l2cap_core.c
This commit is contained in:
Johan Hedberg 2012-02-16 14:23:04 +02:00
commit 46479e6985
2623 changed files with 108932 additions and 45195 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/bluetooth/btusb.c
View file

@ -37,13 +37,13 @@
#define VERSION "0.6"
static int ignore_dga;
static int ignore_csr;
static int ignore_sniffer;
static int disable_scofix;
static int force_scofix;
static bool ignore_dga;
static bool ignore_csr;
static bool ignore_sniffer;
static bool disable_scofix;
static bool force_scofix;
static int reset = 1;
static bool reset = 1;
static struct usb_driver btusb_driver;

4
drivers/bluetooth/hci_bcsp.c
View file

@ -49,8 +49,8 @@
#define VERSION "0.3"
static int txcrc = 1;
static int hciextn = 1;
static bool txcrc = 1;
static bool hciextn = 1;
#define BCSP_TXWINSIZE 4

2
drivers/bluetooth/hci_ldisc.c
View file

@ -48,7 +48,7 @@
#define VERSION "2.2"
static int reset = 0;
static bool reset = 0;
static struct hci_uart_proto *hup[HCI_UART_MAX_PROTO];