vserver 2.0 rc7

[linux-2.6.git] / arch / um / include / um_mmu.h

diff --git a/arch/um/include/um_mmu.h b/arch/um/include/um_mmu.h
index 5243f45..0fa6432 100644 (file)
--- a/arch/um/include/um_mmu.h
+++ b/arch/um/include/um_mmu.h
@@ -6,22 +6,22 @@
 #ifndef __ARCH_UM_MMU_H
 #define __ARCH_UM_MMU_H
 
-#include "linux/config.h"
+#include "uml-config.h"
 #include "choose-mode.h"
 
-#ifdef CONFIG_MODE_TT
+#ifdef UML_CONFIG_MODE_TT
 #include "mmu-tt.h"
 #endif
 
-#ifdef CONFIG_MODE_SKAS
+#ifdef UML_CONFIG_MODE_SKAS
 #include "mmu-skas.h"
 #endif
 
-typedef union {
-#ifdef CONFIG_MODE_TT
+typedef union mm_context {
+#ifdef UML_CONFIG_MODE_TT
        struct mmu_context_tt tt;
 #endif
-#ifdef CONFIG_MODE_SKAS
+#ifdef UML_CONFIG_MODE_SKAS
        struct mmu_context_skas skas;
 #endif
 } mm_context_t;