From: Benoit Boissinot Date: Sat, 16 Apr 2005 22:24:27 +0000 (-0700) Subject: [PATCH] ppc32: fix compilation error in include/asm-m68k/setup.h X-Git-Tag: v2.6.12-rc3~205 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ce3a719bc5772bc84ab6f50ef505da6992778ff;p=linux-2.6 [PATCH] ppc32: fix compilation error in include/asm-m68k/setup.h 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h index 9e23492685..a89aa84073 100644 --- a/include/asm-m68k/setup.h +++ b/include/asm-m68k/setup.h @@ -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__ */