Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / asm-m68k / setup.h

diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h
index 6d198bc..a89aa84 100644 (file)
--- a/include/asm-m68k/setup.h
+++ b/include/asm-m68k/setup.h
@@ -248,7 +248,7 @@ extern unsigned long m68k_fputype;
 extern unsigned long m68k_mmutype;             /* Not really used yet */
 #ifdef CONFIG_VME
 extern unsigned long vme_brdtype;
-#endif 
+#endif
 
     /*
      *  m68k_is040or060 is != 0 for a '040 or higher;
@@ -264,7 +264,7 @@ extern int m68k_is040or060;
 #  define MMU_IS_SUN3 (0)
 #elif defined(CONFIG_M68030) || defined(CONFIG_M68040) || defined(CONFIG_M68060)
 #  define CPU_IS_020 (m68k_cputype & CPU_68020)
-#  define MMU_IS_851 (m68k_cputype & MMU_68851)
+#  define MMU_IS_851 (m68k_mmutype & MMU_68851)
 #  define MMU_IS_SUN3 (0)      /* Sun3 not supported with other CPU enabled */
 #else
 #  define CPU_M68020_ONLY
@@ -357,16 +357,17 @@ extern int m68k_is040or060;
 
 #define NUM_MEMINFO    4
 #define CL_SIZE                256
+#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__ */