diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-23 00:19:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:34 -0800 |
| commit | 6b8121f30d001e2cbae6ede6822f70c73dc3100a (patch) | |
| tree | 32edee2c1d52b1d3390805fb1950537e84d07d2f /include/net | |
| parent | c788a318f6d5e8ebf44286fedddad6c15c4a617c (diff) | |
HACK merge fixups for compile
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 2 |
1 files changed, 0 insertions, 2 deletions
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; }; |