From cd2c169e6a2d15dce3f526b1e2f97e843f8f5787 Mon Sep 17 00:00:00 2001 From: Benoit Boissinot Date: Sat, 16 Apr 2005 15:24:28 -0700 Subject: [PATCH] ppc32: fix compilation error in include/asm/prom.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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; -- cgit v0.10.2