X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-m68k%2Fsetup.h;h=a89aa84073e5867f2928d0abda4d17ca726202e9;hb=9ce3a719bc5772bc84ab6f50ef505da6992778ff;hp=9e23492685ebe6aa9b9e62c9732997f84933ef43;hpb=b625a2b85221821b6831a387ee23ff7d93ffb7d1;p=linux-2.6 diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h index 9e23492685..a89aa84073 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__ */