From 740a0f8c49af0ce5ef99d5e141df16041b624e43 Mon Sep 17 00:00:00 2001
From: Mat Martineau <mathewm@codeaurora.org>
Date: Thu, 17 May 2012 20:53:52 -0700
Subject: [PATCH] --- yaml --- r: 314407 b: refs/heads/master c:
 6ea0048575089e9a714e08bc3debec4b1b9d7664 h: refs/heads/master i:   314405:
 fc0613635f1f3c05524116d3975324246cc291f5   314403:
 bce0b7e580bd23523ab23857ba70bc77e57b5abe   314399:
 45dffa281cddbeab00870c0bcb119fab7ed339e7 v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 548ecb1ab74b..3f21c8ce90b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0362520bf9d35f09c2693e14352f4b0ad07397fa
+refs/heads/master: 6ea0048575089e9a714e08bc3debec4b1b9d7664
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index 293b78a6c644..288c8e660377 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -4399,7 +4399,7 @@ static int l2cap_check_fcs(struct l2cap_chan *chan,  struct sk_buff *skb)
 	return 0;
 }
 
-static inline void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan)
+static void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan)
 {
 	struct l2cap_ctrl control;