patch-2.1.120 linux/include/asm-m68k/setup.h

• Lines: 57
• Date: Wed Sep 2 09:39:18 1998
• Orig file: v2.1.119/linux/include/asm-m68k/setup.h
• Orig date: Tue Jun 23 10:01:28 1998

diff -u --recursive --new-file v2.1.119/linux/include/asm-m68k/setup.h linux/include/asm-m68k/setup.h
@@ -43,7 +43,7 @@
 #ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
-extern u_long m68k_machtype;
+extern unsigned long m68k_machtype;
 #endif /* !__ASSEMBLY__ */
 
 #if !defined(CONFIG_AMIGA)
@@ -186,9 +186,9 @@
 #ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
-extern u_long m68k_cputype;
-extern u_long m68k_fputype;
-extern u_long m68k_mmutype;			/* Not really used yet */
+extern unsigned long m68k_cputype;
+extern unsigned long m68k_fputype;
+extern unsigned long m68k_mmutype;			/* Not really used yet */
 
     /*
      *  m68k_is040or060 is != 0 for a '040 or higher;
@@ -260,29 +260,23 @@
 
 #define CPU_TYPE (m68k_cputype)
 
-#endif /* __KERNEL__ */
-
-
     /*
      *  Miscellaneous
      */
 
-#define NUM_MEMINFO	(4)
-#define CL_SIZE		(256)
+#define NUM_MEMINFO	4
+#define CL_SIZE		256
 
 #ifndef __ASSEMBLY__
+extern int m68k_num_memory;		/* # 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) */
 };
+#endif
 
-#ifdef __KERNEL__
-extern int m68k_num_memory;		/* # of memory blocks found */
-extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
 #endif /* __KERNEL__ */
-
-#endif /* !__ASSEMBLY__ */
-
 
 #endif /* _M68K_SETUP_H */