diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/net/bluetooth/rfcomm.h | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/net/bluetooth/rfcomm.h')
| -rw-r--r-- | include/net/bluetooth/rfcomm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index 98ec7a320689..4dc8d92a4638 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h | |||
| @@ -180,7 +180,9 @@ struct rfcomm_dlc { | |||
| 180 | u8 addr; | 180 | u8 addr; |
| 181 | u8 priority; | 181 | u8 priority; |
| 182 | u8 v24_sig; | 182 | u8 v24_sig; |
| 183 | u8 remote_v24_sig; | ||
| 183 | u8 mscex; | 184 | u8 mscex; |
| 185 | u8 out; | ||
| 184 | 186 | ||
| 185 | u32 link_mode; | 187 | u32 link_mode; |
| 186 | 188 | ||