Commit 9ce3a719 authored by Benoit Boissinot's avatar Benoit Boissinot Committed by Linus Torvalds

[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: default avatarBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b625a2b8
...@@ -360,14 +360,14 @@ extern int m68k_is040or060; ...@@ -360,14 +360,14 @@ extern int m68k_is040or060;
#define COMMAND_LINE_SIZE CL_SIZE #define COMMAND_LINE_SIZE CL_SIZE
#ifndef __ASSEMBLY__ #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 { struct mem_info {
unsigned long addr; /* physical address of memory chunk */ unsigned long addr; /* physical address of memory chunk */
unsigned long size; /* length of memory chunk (in bytes) */ 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
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment