git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
mmu.h
diff --git
a/arch/m68k/include/asm/mmu.h
b/arch/m68k/include/asm/mmu.h
index
a81d394
..
8a11a63
100644
(file)
--- a/
arch/m68k/include/asm/mmu.h
+++ b/
arch/m68k/include/asm/mmu.h
@@
-1,5
+1,13
@@
-#ifdef __uClinux__
-#include "mmu_no.h"
+#ifndef __MMU_H
+#define __MMU_H
+
+#ifdef CONFIG_MMU
+/* Default "unsigned long" context */
+typedef unsigned long mm_context_t;
#else
#else
-#include "mmu_mm.h"
+typedef struct {
+ unsigned long end_brk;
+} mm_context_t;
+#endif
+
#endif
#endif