* [patch 040/198] ppc32: fix compilation error in include/asm-m68k/setup.h
@ 2005-04-12 10:31 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2005-04-12 10:31 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, akpm, benoit.boissinot
From: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
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 <benoit.boissinot@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/include/asm-m68k/setup.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -puN include/asm-m68k/setup.h~ppc32-fix-compilation-error-in-include-asm-m68k-setuph include/asm-m68k/setup.h
--- 25/include/asm-m68k/setup.h~ppc32-fix-compilation-error-in-include-asm-m68k-setuph 2005-04-12 03:21:12.928171520 -0700
+++ 25-akpm/include/asm-m68k/setup.h 2005-04-12 03:21:12.931171064 -0700
@@ -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__ */
_
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-04-13 0:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-04-12 10:31 [patch 040/198] ppc32: fix compilation error in include/asm-m68k/setup.h akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®