[PATCH] Standardize pxx_page macros

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

diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h
index 9e23492685ebe6aa9b9e62c9732997f84933ef43..7facc9a46e74dde0ce6f792cab5fd3189fa1e003 100644 (file)
--- a/include/asm-m68k/setup.h
+++ b/include/asm-m68k/setup.h
@@ -23,7 +23,6 @@
 #ifndef _M68K_SETUP_H
 #define _M68K_SETUP_H
 
-#include <linux/config.h>
 
 
     /*
@@ -360,14 +359,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__ */