diff options
| author | Paul Moore <pmoore@redhat.com> | 2013-11-26 17:32:55 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2013-11-26 17:32:55 -0500 |
| commit | dd0a11815a339d6deeea8357574f8126a8404c92 (patch) | |
| tree | c3c743ac6323e1caf9e987d6946cc4b2333a8256 /net/vmw_vsock/vmci_transport.h | |
| parent | 42d64e1add3a1ce8a787116036163b8724362145 (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Diffstat (limited to 'net/vmw_vsock/vmci_transport.h')
| -rw-r--r-- | net/vmw_vsock/vmci_transport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/vmw_vsock/vmci_transport.h b/net/vmw_vsock/vmci_transport.h index fd88ea8924e4..ce6c9623d5f0 100644 --- a/net/vmw_vsock/vmci_transport.h +++ b/net/vmw_vsock/vmci_transport.h | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | #include <linux/vmw_vmci_defs.h> | 19 | #include <linux/vmw_vmci_defs.h> |
| 20 | #include <linux/vmw_vmci_api.h> | 20 | #include <linux/vmw_vmci_api.h> |
| 21 | 21 | ||
| 22 | #include "vsock_addr.h" | 22 | #include <net/vsock_addr.h> |
| 23 | #include "af_vsock.h" | 23 | #include <net/af_vsock.h> |
| 24 | 24 | ||
| 25 | /* If the packet format changes in a release then this should change too. */ | 25 | /* If the packet format changes in a release then this should change too. */ |
| 26 | #define VMCI_TRANSPORT_PACKET_VERSION 1 | 26 | #define VMCI_TRANSPORT_PACKET_VERSION 1 |