diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 11:14:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 11:14:13 -0500 |
| commit | ea991f06d851d58268eac6ce5c2152397757c958 (patch) | |
| tree | e789e2d8284cf38aecea4f4a0fd0a4c52157d934 /include | |
| parent | 170926993a320cd7b53c388e6ffc759de4fac472 (diff) | |
| parent | bb831eb2027c12a740ad4e4ad78f2a0e841ae808 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPVS]: More endianness fixed.
[IPVS]: Compile fix for annotations in userland.
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip_vs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 49c717e3b040..903108e583f8 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #define _IP_VS_H | 7 | #define _IP_VS_H |
| 8 | 8 | ||
| 9 | #include <asm/types.h> /* For __uXX types */ | 9 | #include <asm/types.h> /* For __uXX types */ |
| 10 | #include <linux/types.h> /* For __beXX types in userland */ | ||
| 10 | 11 | ||
| 11 | #define IP_VS_VERSION_CODE 0x010201 | 12 | #define IP_VS_VERSION_CODE 0x010201 |
| 12 | #define NVERSION(version) \ | 13 | #define NVERSION(version) \ |