diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /include/asm-powerpc/string.h | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-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 */ |