From: Benoit Boissinot Date: Sat, 16 Apr 2005 22:24:28 +0000 (-0700) Subject: [PATCH] ppc32: fix compilation error in include/asm/prom.h X-Git-Tag: v2.6.12-rc3~203 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cd2c169e6a2d15dce3f526b1e2f97e843f8f5787;p=~emulex%2Finfiniband.git [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h index 56394c6cf52..75c0637acdc 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;