[patch 042/198] ppc32: fix compilation error in include/asm/prom.h

[akpm@osdl.org]

From: Benoit Boissinot <benoit.boissinot@ens-lyon.org>

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

 25-akpm/include/asm-ppc/prom.h |    3 ---
 1 files changed, 3 deletions(-)

diff -puN include/asm-ppc/prom.h~ppc32-fix-compilation-error-in-include-asm-promh include/asm-ppc/prom.h
--- 25/include/asm-ppc/prom.h~ppc32-fix-compilation-error-in-include-asm-promh	2005-04-12 03:21:13.348107680 -0700
+++ 25-akpm/include/asm-ppc/prom.h	2005-04-12 03:21:13.351107224 -0700
@@ -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;
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/