[2.6 ppc patch] fix compilation error in include/asm/prom.h

[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

The following patch solves it.

Signed-Off-By: Benoit Boissinot <benoit.boissinot@ens-lyon.org>


--- ./include/asm-ppc/prom.h.orig	2005-04-11 14:49:31.000000000 +0200
+++ ./include/asm-ppc/prom.h	2005-04-11 14:49:46.000000000 +0200
@@ -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/