tree 7eda13cbd83dc61ea35b04bbb02802a0acb5f68d
parent 51e6606491a0f5deaba52fb00c0374b9cb612f98
author Benoit Boissinot <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:28 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:28 -0700

[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

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

Index: include/asm-ppc/prom.h
===================================================================
--- 38488f712b29132cfc54fa6b4c3ee9821fff629b/include/asm-ppc/prom.h  
(mode:100644 sha1:56394c6cf52e3be20d899b92f73d9d43d98a8434)
+++ 7eda13cbd83dc61ea35b04bbb02802a0acb5f68d/include/asm-ppc/prom.h  
(mode:100644 sha1:75c0637acdc8ad2e7615be70f3819b71905befb2)
@@ -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 bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to