diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-14 10:56:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-14 10:56:40 -0400 |
| commit | 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f (patch) | |
| tree | 86b15d8cd3e25c97b348b5a61bdb16c02726a480 /net/bluetooth/hidp/hidp.h | |
| parent | f6b72b6217f8c24f2a54988e58af858b4e66024d (diff) | |
| parent | 51414d41084496aaefd06d7f19eb8206e8bfac2d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'net/bluetooth/hidp/hidp.h')
| -rw-r--r-- | net/bluetooth/hidp/hidp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h index 19e95004b286..af1bcc823f26 100644 --- a/net/bluetooth/hidp/hidp.h +++ b/net/bluetooth/hidp/hidp.h | |||
| @@ -142,6 +142,7 @@ struct hidp_session { | |||
| 142 | uint ctrl_mtu; | 142 | uint ctrl_mtu; |
| 143 | uint intr_mtu; | 143 | uint intr_mtu; |
| 144 | 144 | ||
| 145 | atomic_t terminate; | ||
| 145 | struct task_struct *task; | 146 | struct task_struct *task; |
| 146 | 147 | ||
| 147 | unsigned char keys[8]; | 148 | unsigned char keys[8]; |