diff options
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> | 2005-04-16 18:24:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:28 -0400 |
commit | cd2c169e6a2d15dce3f526b1e2f97e843f8f5787 (patch) | |
tree | 7eda13cbd83dc61ea35b04bbb02802a0acb5f68d /include | |
parent | 51e6606491a0f5deaba52fb00c0374b9cb612f98 (diff) |
[PATCH] ppc32: fix compilation error in include/asm/prom.h
make defconfig give the following error on ppc (gcc-4):
arch/ppc/syslib/prom_init.c:120: error: static declaration of ‘prom_display_paths’ follows non-static declaration
include/asm/prom.h:17: error: previous declaration of ‘prom_display_paths’ was here
arch/ppc/syslib/prom_init.c:122: error: static declaration of ‘prom_num_displays’ follows non-static declaration
include/asm/prom.h:18: error: previous declaration of ‘prom_num_displays’ was here
Signed-Off-By: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ppc/prom.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h index 56394c6cf52e..75c0637acdc8 100644 --- a/include/asm-ppc/prom.h +++ b/include/asm-ppc/prom.h | |||
@@ -14,9 +14,6 @@ | |||
14 | typedef u32 phandle; | 14 | typedef u32 phandle; |
15 | typedef u32 ihandle; | 15 | typedef u32 ihandle; |
16 | 16 | ||
17 | extern char *prom_display_paths[]; | ||
18 | extern unsigned int prom_num_displays; | ||
19 | |||
20 | struct address_range { | 17 | struct address_range { |
21 | unsigned int space; | 18 | unsigned int space; |
22 | unsigned int address; | 19 | unsigned int address; |