projects/linux·commit 9ce3a719

[PATCH] ppc32: fix compilation error in include/asm-m68k/setup.h

9ce3a719 · Benoit Boissinot <[email protected]> · 2005-04-16 15:24:27 -07:00

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]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
9ce3a719bc5772bc84ab6f50ef505da6992778ff
Parents
b625a2b8

Changes

1 files changed · +4 −4

FileStatusAddDelContent
include/asm-m68k/setup.hmodified+4−4View file

include/asm-m68k/setup.h

View file
diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h
index 9e23492..a89aa84 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__ */