diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/ceph/messenger.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/ceph/messenger.h')
| -rw-r--r-- | include/linux/ceph/messenger.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 189ae0637634..14ba5ee738a9 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | #include <linux/uio.h> | 8 | #include <linux/uio.h> |
| 9 | #include <linux/workqueue.h> | 9 | #include <linux/workqueue.h> |
| 10 | 10 | ||
| 11 | #include "types.h" | 11 | #include <linux/ceph/types.h> |
| 12 | #include "buffer.h" | 12 | #include <linux/ceph/buffer.h> |
| 13 | 13 | ||
| 14 | struct ceph_msg; | 14 | struct ceph_msg; |
| 15 | struct ceph_connection; | 15 | struct ceph_connection; |