diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /include/asm-x86/checksum_32.h | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'include/asm-x86/checksum_32.h')
| -rw-r--r-- | include/asm-x86/checksum_32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/checksum_32.h b/include/asm-x86/checksum_32.h index 52bbb0d8c4c1..d041e8cda227 100644 --- a/include/asm-x86/checksum_32.h +++ b/include/asm-x86/checksum_32.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _I386_CHECKSUM_H | 1 | #ifndef ASM_X86__CHECKSUM_32_H |
| 2 | #define _I386_CHECKSUM_H | 2 | #define ASM_X86__CHECKSUM_32_H |
| 3 | 3 | ||
| 4 | #include <linux/in6.h> | 4 | #include <linux/in6.h> |
| 5 | 5 | ||
| @@ -186,4 +186,4 @@ static inline __wsum csum_and_copy_to_user(const void *src, | |||
| 186 | return (__force __wsum)-1; /* invalid checksum */ | 186 | return (__force __wsum)-1; /* invalid checksum */ |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | #endif | 189 | #endif /* ASM_X86__CHECKSUM_32_H */ |