diff options
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> | 2005-04-16 15:24:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:27 -0700 |
| commit | 9ce3a719bc5772bc84ab6f50ef505da6992778ff (patch) | |
| tree | 0ef18ef670bb885a4de66e69f072bd3f6c1be13a | |
| parent | b625a2b85221821b6831a387ee23ff7d93ffb7d1 (diff) | |
| download | blackbird-op-linux-9ce3a719bc5772bc84ab6f50ef505da6992778ff.tar.gz blackbird-op-linux-9ce3a719bc5772bc84ab6f50ef505da6992778ff.zip | |
[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>
| -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; #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__ */ |
