diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-16 07:23:04 -0500 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-16 07:25:34 -0500 |
| commit | 46479e698530b8197d601a23317b7c7654195338 (patch) | |
| tree | 710b2758ecd7d8a6ada37724c5d4c8027d5f358f /drivers/bluetooth/hci_ldisc.c | |
| parent | 7b99b659d90c5d421cb1867295c78a4c0c030734 (diff) | |
| parent | ca994a36f585432458ead9133fcfe05440edbb7b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git
Conflicts:
include/net/bluetooth/l2cap.h
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c
Diffstat (limited to 'drivers/bluetooth/hci_ldisc.c')
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 01c23dfe2a10..c2d637adb3ca 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | 48 | ||
| 49 | #define VERSION "2.2" | 49 | #define VERSION "2.2" |
| 50 | 50 | ||
| 51 | static int reset = 0; | 51 | static bool reset = 0; |
| 52 | 52 | ||
| 53 | static struct hci_uart_proto *hup[HCI_UART_MAX_PROTO]; | 53 | static struct hci_uart_proto *hup[HCI_UART_MAX_PROTO]; |
| 54 | 54 | ||