summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>2005-04-16 15:24:28 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:24:28 -0700
commitcd2c169e6a2d15dce3f526b1e2f97e843f8f5787 (patch)
tree7eda13cbd83dc61ea35b04bbb02802a0acb5f68d
parent51e6606491a0f5deaba52fb00c0374b9cb612f98 (diff)
downloadop-kernel-dev-cd2c169e6a2d15dce3f526b1e2f97e843f8f5787.zip
op-kernel-dev-cd2c169e6a2d15dce3f526b1e2f97e843f8f5787.tar.gz
[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>
-rw-r--r--include/asm-ppc/prom.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h
index 56394c6..75c0637 100644
--- a/include/asm-ppc/prom.h
+++ b/include/asm-ppc/prom.h
@@ -14,9 +14,6 @@
typedef u32 phandle;
typedef u32 ihandle;
-extern char *prom_display_paths[];
-extern unsigned int prom_num_displays;
-
struct address_range {
unsigned int space;
unsigned int address;
OpenPOWER on IntegriCloud