Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Benoit Boissinot and committed by
Linus Torvalds
cd2c169e 51e66064

-3
-3
include/asm-ppc/prom.h
··· 14 14 typedef u32 phandle; 15 15 typedef u32 ihandle; 16 16 17 - extern char *prom_display_paths[]; 18 - extern unsigned int prom_num_displays; 19 - 20 17 struct address_range { 21 18 unsigned int space; 22 19 unsigned int address;