diff --git a/arch/ppc/boot/utils/mkbugboot.c b/arch/ppc/boot/utils/mkbugboot.c index 8158d8c6f7c3a3f09adf1eed35c7e70747be2e88..f6629a28e88dde18aaae7a83c0064b497ce7812b 100644 --- a/arch/ppc/boot/utils/mkbugboot.c +++ b/arch/ppc/boot/utils/mkbugboot.c @@ -1,5 +1,5 @@ /* - * arch/ppc/pp3boot/mkbugboot.c + * arch/ppc/boot/utils/mkbugboot.c * * Makes a Motorola PPCBUG ROM bootable image which can be flashed * into one of the FLASH banks on a Motorola PowerPlus board. @@ -21,6 +21,11 @@ #include <stdlib.h> #include <errno.h> #include <fcntl.h> +#ifdef __sun__ +#include <inttypes.h> +#else +#include <stdint.h> +#endif #ifdef __i386__ #define cpu_to_be32(x) le32_to_cpu(x) @@ -49,11 +54,6 @@ unsigned short le16_to_cpu(unsigned short x) /* size of read buffer */ #define SIZE 0x1000 -/* typedef long int32_t; */ -typedef unsigned long uint32_t; -typedef unsigned short uint16_t; -typedef unsigned char uint8_t; - /* PPCBUG ROM boot header */ typedef struct bug_boot_header { uint8_t magic_word[4]; /* "BOOT" */ diff --git a/arch/ppc/boot/utils/mktree.c b/arch/ppc/boot/utils/mktree.c index 7ef98c077aadba5d88600e707bbd7f0050ac9ae1..2be22e28f2b316f416a89ccc70f219378233092b 100644 --- a/arch/ppc/boot/utils/mktree.c +++ b/arch/ppc/boot/utils/mktree.c @@ -15,7 +15,11 @@ #include <sys/stat.h> #include <unistd.h> #include <netinet/in.h> +#ifdef __sun__ +#include <inttypes.h> +#else #include <stdint.h> +#endif /* This gets tacked on the front of the image. There are also a few * bytes allocated after the _start label used by the boot rom (see diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index b41b718edffefa37bd0374f6ea79404d717d9410..86ea6a34d7919c2cb6dbfd2d85ca4065d1692e61 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c @@ -1,5 +1,9 @@ #include <netinet/in.h> +#ifdef __sun__ +#include <inttypes.h> +#else #include <stdint.h> +#endif #include <ctype.h> #include <errno.h> #include <string.h>