]> err.no Git - linux-2.6/commit
[PATCH] ppc32: fix compilation error in include/asm/prom.h
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 16 Apr 2005 22:24:28 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 22:24:28 +0000 (15:24 -0700)
commitcd2c169e6a2d15dce3f526b1e2f97e843f8f5787
tree7eda13cbd83dc61ea35b04bbb02802a0acb5f68d
parent51e6606491a0f5deaba52fb00c0374b9cb612f98
[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 <benoit.boissinot@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/asm-ppc/prom.h