diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 17:14:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 17:14:13 +0100 |
| commit | ea991f06d851d58268eac6ce5c2152397757c958 (patch) | |
| tree | e789e2d8284cf38aecea4f4a0fd0a4c52157d934 /include | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | [IPVS]: More endianness fixed. (diff) | |
| download | linux-ea991f06d851d58268eac6ce5c2152397757c958.tar.xz linux-ea991f06d851d58268eac6ce5c2152397757c958.zip | |
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 @@ #define _IP_VS_H #include <asm/types.h> /* For __uXX types */ +#include <linux/types.h> /* For __beXX types in userland */ #define IP_VS_VERSION_CODE 0x010201 #define NVERSION(version) \ |