diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
commit | 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 (patch) | |
tree | db2ce73665b250672f5f5c0cf7544ec370c122f9 /arch/ppc64/boot/zlib.c | |
parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
parent | c594adad5653491813959277fb87a2fef54c4e05 (diff) | |
download | linux-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.tar.gz linux-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.tar.bz2 linux-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.zip |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/boot/zlib.c')
-rw-r--r-- | arch/ppc64/boot/zlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/boot/zlib.c b/arch/ppc64/boot/zlib.c index 78837e884b8b..0d910cd2079d 100644 --- a/arch/ppc64/boot/zlib.c +++ b/arch/ppc64/boot/zlib.c @@ -107,7 +107,7 @@ extern void *memcpy(void *, const void *, unsigned long); /* Diagnostic functions */ #ifdef DEBUG_ZLIB -# include <stdio.h> +# include "stdio.h" # ifndef verbose # define verbose 0 # endif |