diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 12:14:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 12:14:49 -0500 |
commit | cb20c28a9c41052c2d7220325dae60c16f417ded (patch) | |
tree | fa3d768989b3de7c8c914495c193d67baa51f7ea /arch/powerpc | |
parent | a08e37f31aa2800e0c9d20e1fc9283a06901cac2 (diff) | |
parent | 25583d4b5aa2c9aa5ed03ecc2ce73f3922714495 (diff) |
Merge branch 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc
* 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc:
Makefile: Add -Wmising-prototypes to HOSTCFLAGS
oss: Mark loadhex static in hex2hex.c
dtc: Mark various internal functions static
dtc: Set "noinput" in the lexer to avoid an unused function
drm: radeon: Mark several functions static in mkregtable
arch/sparc/boot/*.c: Mark various internal functions static
arch/powerpc/boot/addRamDisk.c: Mark several internal functions static
arch/alpha/boot/tools/objstrip.c: Mark "usage" static
Documentation/vm/page-types.c: Declare checked_open static
genksyms: Mark is_reserved_word static
kconfig: Mark various internal functions static
kconfig: Make zconf.y work with current bison
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/boot/addRamDisk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/boot/addRamDisk.c b/arch/powerpc/boot/addRamDisk.c index c02a99952be7..893f446cbd22 100644 --- a/arch/powerpc/boot/addRamDisk.c +++ b/arch/powerpc/boot/addRamDisk.c | |||
@@ -58,7 +58,7 @@ static int check_elf64(void *p, int size, struct addr_range *r) | |||
58 | 58 | ||
59 | return 64; | 59 | return 64; |
60 | } | 60 | } |
61 | void get4k(FILE *file, char *buf ) | 61 | static void get4k(FILE *file, char *buf ) |
62 | { | 62 | { |
63 | unsigned j; | 63 | unsigned j; |
64 | unsigned num = fread(buf, 1, 4096, file); | 64 | unsigned num = fread(buf, 1, 4096, file); |
@@ -66,12 +66,12 @@ void get4k(FILE *file, char *buf ) | |||
66 | buf[j] = 0; | 66 | buf[j] = 0; |
67 | } | 67 | } |
68 | 68 | ||
69 | void put4k(FILE *file, char *buf ) | 69 | static void put4k(FILE *file, char *buf ) |
70 | { | 70 | { |
71 | fwrite(buf, 1, 4096, file); | 71 | fwrite(buf, 1, 4096, file); |
72 | } | 72 | } |
73 | 73 | ||
74 | void death(const char *msg, FILE *fdesc, const char *fname) | 74 | static void death(const char *msg, FILE *fdesc, const char *fname) |
75 | { | 75 | { |
76 | fprintf(stderr, msg); | 76 | fprintf(stderr, msg); |
77 | fclose(fdesc); | 77 | fclose(fdesc); |