[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>

diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h
index 56394c6cf52e3be20d899b92f73d9d43d98a8434..75c0637acdc8ad2e7615be70f3819b71905befb2 100644 (file)
--- 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;