diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
| commit | 2502991560dc8244dbe10e48473d85722c1e2ec1 (patch) | |
| tree | 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add /include/asm-x86/string_32.h | |
| parent | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (diff) | |
| parent | a9ff8f6462635c8d9f8d64b7b10ddcea8404d77b (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'include/asm-x86/string_32.h')
| -rw-r--r-- | include/asm-x86/string_32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/string_32.h b/include/asm-x86/string_32.h index 193578cd1fd9..487843ed245a 100644 --- a/include/asm-x86/string_32.h +++ b/include/asm-x86/string_32.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _I386_STRING_H_ | 1 | #ifndef ASM_X86__STRING_32_H |
| 2 | #define _I386_STRING_H_ | 2 | #define ASM_X86__STRING_32_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| @@ -323,4 +323,4 @@ extern void *memscan(void *addr, int c, size_t size); | |||
| 323 | 323 | ||
| 324 | #endif /* __KERNEL__ */ | 324 | #endif /* __KERNEL__ */ |
| 325 | 325 | ||
| 326 | #endif | 326 | #endif /* ASM_X86__STRING_32_H */ |