diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /include/net/bluetooth/rfcomm.h | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
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 | ||