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/btusb.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/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 066d5ec83a9b..e61a195969bf 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
| @@ -37,13 +37,13 @@ | |||
| 37 | 37 | ||
| 38 | #define VERSION "0.6" | 38 | #define VERSION "0.6" |
| 39 | 39 | ||
| 40 | static int ignore_dga; | 40 | static bool ignore_dga; |
| 41 | static int ignore_csr; | 41 | static bool ignore_csr; |
| 42 | static int ignore_sniffer; | 42 | static bool ignore_sniffer; |
| 43 | static int disable_scofix; | 43 | static bool disable_scofix; |
| 44 | static int force_scofix; | 44 | static bool force_scofix; |
| 45 | 45 | ||
| 46 | static int reset = 1; | 46 | static bool reset = 1; |
| 47 | 47 | ||
| 48 | static struct usb_driver btusb_driver; | 48 | static struct usb_driver btusb_driver; |
| 49 | 49 | ||