tree b80166d845c306e5155cdb9950af3737ff4931ef
parent cddfd97d68f07a1da6554c1acac4cf9e840a27f8
author Benoit Boissinot <[EMAIL PROTECTED]> Tue Apr 12 08:25:00 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:00 2005
[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
setup.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Index: include/asm-m68k/setup.h
===================================================================
--- 91a3fec9a0e74c6262facf33b1409a7ae25d8558/include/asm-m68k/setup.h
(mode:100644 sha1:838252e793ea77e044d9091cb14ba98973463924)
+++ b80166d845c306e5155cdb9950af3737ff4931ef/include/asm-m68k/setup.h
(mode:100644 sha1:2cdc62905cee7b22f0502016b31ce7ae8dbd9d51)
@@ -360,14 +360,14 @@
#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__ */
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
