ppc32: fix compilation error in include/asm-m68k/setup.h
PATCH 40/198 ppc32: fix compilation error in include/asm-m68k/setup.h
From: Benoit Boissinot <[email protected]>
make defconfig give the following error on ppc (gcc-4):
include/asm-m68k/setup.h:365: error: array type has incomplete element type
Signed-off-by Benoit Boissinot <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
25-akpm/include/asm-m68k/setup.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
include/asm-m68k/setup.h renamed from include/asm-m68k/setup.h~ppc32-fix-compilation-error-in-include-asm-m68k-setuph +4 -4
@@ -360,14 +360,14 @@ extern int m68k_is040or060;#define COMMAND_LINE_SIZE CL_SIZE#ifndef __ASSEMBLY__ -extern int m68k_num_memory;/* # of memory blocks found (and used) */ -extern int m68k_realnum_memory;/* real # of memory blocks found */ -extern struct mem_info m68k_memory[NUM_MEMINFO ];/* memory description */ -struct mem_info {unsigned long addr;/* physical address of memory chunk */ unsigned long size;/* length of memory chunk (in bytes) */ }; + +extern int m68k_num_memory;/* # of memory blocks found (and used) */ +extern int m68k_realnum_memory;/* real # of memory blocks found */ +extern struct mem_info m68k_memory[NUM_MEMINFO ];/* memory description */ #endif #endif /* __KERNEL__ */
_