diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
| commit | 3aed77bc84013fced136977b7cc17fff60eddf7a (patch) | |
| tree | 75ee4060f58f033deb16771a303fb55dd370b6f9 /include/asm-powerpc/string.h | |
| parent | 0b968d23610d65a46299347b141a687e207bd294 (diff) | |
| parent | b2ad7b5e8115582cdf5bbda065aa516c24d62c21 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'include/asm-powerpc/string.h')
| -rw-r--r-- | include/asm-powerpc/string.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/string.h b/include/asm-powerpc/string.h index 225575997392..8606a696c088 100644 --- a/include/asm-powerpc/string.h +++ b/include/asm-powerpc/string.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _PPC_STRING_H_ | 1 | #ifndef _ASM_POWERPC_STRING_H |
| 2 | #define _PPC_STRING_H_ | 2 | #define _ASM_POWERPC_STRING_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| @@ -29,4 +29,4 @@ extern void * memchr(const void *,int,__kernel_size_t); | |||
| 29 | 29 | ||
| 30 | #endif /* __KERNEL__ */ | 30 | #endif /* __KERNEL__ */ |
| 31 | 31 | ||
| 32 | #endif | 32 | #endif /* _ASM_POWERPC_STRING_H */ |