linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [2.6 ppc patch] fix compilation error in include/asm/prom.h
@ 2005-04-11 16:44 Benoit Boissinot
  0 siblings, 0 replies; only message in thread
From: Benoit Boissinot @ 2005-04-11 16:44 UTC (permalink / raw)
  To: akpm; +Cc: linux-kernel, paulus

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;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-04-11 16:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-04-11 16:44 [2.6 ppc patch] fix compilation error in include/asm/prom.h Benoit Boissinot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).