---

yaml --- r: 139969 b: refs/heads/master c: 606333d h: refs/heads/master i: 139967: 4da5d68 v: v3
git-mirror · Mar 24, 2009 · e055077 · e055077
1 parent 223fd05
commit e055077
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 29 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8bd42707fc1d8e72e0cc722bdc0c0975b52d958
+refs/heads/master: 606333d64e06db9ae14b5a025380bc5954b1a6c4
diff --git a/trunk/arch/m68k/include/asm/pgalloc.h b/trunk/arch/m68k/include/asm/pgalloc.h
@@ -1,5 +1,19 @@
-#ifdef __uClinux__
-#include "pgalloc_no.h"
+#ifndef M68K_PGALLOC_H
+#define M68K_PGALLOC_H
+
+#include <linux/mm.h>
+#include <linux/highmem.h>
+#include <asm/setup.h>
+
+#ifdef CONFIG_MMU
+#include <asm/virtconvert.h>
+#ifdef CONFIG_SUN3
+#include <asm/sun3_pgalloc.h>
 #else
-#include "pgalloc_mm.h"
+#include <asm/motorola_pgalloc.h>
 #endif
+
+extern void m68k_setup_node(int node);
+#endif
+
+#endif /* M68K_PGALLOC_H */
diff --git a/trunk/arch/m68k/include/asm/pgalloc_mm.h b/trunk/arch/m68k/include/asm/pgalloc_mm.h
diff --git a/trunk/arch/m68k/include/asm/pgalloc_no.h b/trunk/arch/m68k/include/asm/pgalloc_no.h