From 2857712be1783ac87ad41f0a694270174398610f Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Fri, 11 Nov 2011 17:02:14 +0200
Subject: [PATCH] --- yaml --- r: 278575 b: refs/heads/master c:
 8830f514106fbd09ba5bbbaae043a8624ceb9d67 h: refs/heads/master i:   278573:
 2106972486c18a431cfcb1558f3586a8f1c3b1e0   278571:
 1649a5262ebff53b233a5ecdb06c5f71e8c4dff5   278567:
 be46ed021b15aee377db3bf02f9e7fec56be6dcc   278559:
 c448a658ed5e0b8c29492f189a8dd86d5deb984a v: v3

---
 [refs]                              | 2 +-
 trunk/include/net/bluetooth/hci.h   | 2 ++
 trunk/include/net/bluetooth/l2cap.h | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a20bb0c40a7b..fbcd42d31c19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 453a83869c98746006d9a6c03e2b208b9018f671
+refs/heads/master: 8830f514106fbd09ba5bbbaae043a8624ceb9d67
diff --git a/trunk/include/net/bluetooth/hci.h b/trunk/include/net/bluetooth/hci.h
index e284dd906b9e..376c57420abe 100644
--- a/trunk/include/net/bluetooth/hci.h
+++ b/trunk/include/net/bluetooth/hci.h
@@ -1344,4 +1344,6 @@ struct hci_inquiry_req {
 };
 #define IREQ_CACHE_FLUSH 0x0001
 
+extern int enable_hs;
+
 #endif /* __HCI_H */
diff --git a/trunk/include/net/bluetooth/l2cap.h b/trunk/include/net/bluetooth/l2cap.h
index 1e6fda438130..30719eb2e77c 100644
--- a/trunk/include/net/bluetooth/l2cap.h
+++ b/trunk/include/net/bluetooth/l2cap.h
@@ -792,7 +792,6 @@ static inline __u8 __ctrl_size(struct l2cap_chan *chan)
 }
 
 extern int disable_ertm;
-extern int enable_hs;
 
 int l2cap_init_sockets(void);
 void l2cap_cleanup_sockets(void);