tree 64648fe7b0bbb694c0ae5d8f9c1ec0d8e2fe09dd
parent ae8e00596fa3bd25f55f471d81e86c3a94cee8f5
author Benoit Boissinot <[EMAIL PROTECTED]> Tue Apr 12 08:25:02 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:02 2005

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

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

Index: include/asm-ppc/prom.h
===================================================================
--- 1a6c2a7d9c369c7ce6c93c1b04247f0477feb36d/include/asm-ppc/prom.h  
(mode:100644 sha1:4676dc013b79946339a6d936b97915f2523cb162)
+++ 64648fe7b0bbb694c0ae5d8f9c1ec0d8e2fe09dd/include/asm-ppc/prom.h  
(mode:100644 sha1:31363728deee7e0fd6681352bf5cf39f6a4dbb34)
@@ -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