diff options
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> | 2005-04-16 18:24:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:27 -0400 |
commit | 9ce3a719bc5772bc84ab6f50ef505da6992778ff (patch) | |
tree | 0ef18ef670bb885a4de66e69f072bd3f6c1be13a /include/asm-m68k | |
parent | b625a2b85221821b6831a387ee23ff7d93ffb7d1 (diff) |
[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 <benoit.boissinot@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68k')
-rw-r--r-- | include/asm-m68k/setup.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h index 9e23492685eb..a89aa84073e5 100644 --- a/include/asm-m68k/setup.h +++ b/include/asm-m68k/setup.h | |||
@@ -360,14 +360,14 @@ extern int m68k_is040or060; | |||
360 | #define COMMAND_LINE_SIZE CL_SIZE | 360 | #define COMMAND_LINE_SIZE CL_SIZE |
361 | 361 | ||
362 | #ifndef __ASSEMBLY__ | 362 | #ifndef __ASSEMBLY__ |
363 | extern int m68k_num_memory; /* # of memory blocks found (and used) */ | ||
364 | extern int m68k_realnum_memory; /* real # of memory blocks found */ | ||
365 | extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */ | ||
366 | |||
367 | struct mem_info { | 363 | struct mem_info { |
368 | unsigned long addr; /* physical address of memory chunk */ | 364 | unsigned long addr; /* physical address of memory chunk */ |
369 | unsigned long size; /* length of memory chunk (in bytes) */ | 365 | unsigned long size; /* length of memory chunk (in bytes) */ |
370 | }; | 366 | }; |
367 | |||
368 | extern int m68k_num_memory; /* # of memory blocks found (and used) */ | ||
369 | extern int m68k_realnum_memory; /* real # of memory blocks found */ | ||
370 | extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */ | ||
371 | #endif | 371 | #endif |
372 | 372 | ||
373 | #endif /* __KERNEL__ */ | 373 | #endif /* __KERNEL__ */ |