From 6b8121f30d001e2cbae6ede6822f70c73dc3100a Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@nvidia.com>
Date: Sun, 23 Oct 2011 00:19:18 -0700
Subject: HACK merge fixups for compile

Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
---
 include/net/bluetooth/l2cap.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include/net')

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 7493317a91d9..4f34ad25e75c 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -418,8 +418,6 @@ struct l2cap_conn {
 
 	struct timer_list security_timer;
 
-	struct timer_list security_timer;
-
 	struct list_head chan_l;
 	rwlock_t	chan_lock;
 };
-- 
cgit v1.2.3