diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-07 21:30:53 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-07 21:30:53 +0200 |
| commit | f3b3e36f4ecad9fd7b0ae04d7400f2153a7834eb (patch) | |
| tree | 94417c101111e299fecd93ff41b2304e47e59e2c /include/net/bluetooth/l2cap.h | |
| parent | ar9170usb: purge obsolete driver (diff) | |
| parent | Bluetooth: convert net/bluetooth/ to kstrtox (diff) | |
| download | linux-f3b3e36f4ecad9fd7b0ae04d7400f2153a7834eb.tar.xz linux-f3b3e36f4ecad9fd7b0ae04d7400f2153a7834eb.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
| -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 4f4bff1eaed6..2b9ca0d5c4a0 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -280,7 +280,6 @@ struct l2cap_conn_param_update_rsp { struct l2cap_chan_list { struct sock *head; rwlock_t lock; - long num; }; struct l2cap_conn { @@ -302,7 +301,6 @@ struct l2cap_conn { struct sk_buff *rx_skb; __u32 rx_len; - __u8 rx_ident; __u8 tx_ident; __u8 disc_reason; |