X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-m68k%2Fsetup.h;h=9e23492685ebe6aa9b9e62c9732997f84933ef43;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=6d198bc5ffd584d1704e86bd78d5b59807f257b8;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h index 6d198bc5f..9e2349268 100644 --- 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,6 +357,7 @@ 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) */