This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-arm / page.h

diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index 464c53d..081130c 100644 (file)
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -85,10 +85,14 @@
 #endif
 
 #ifdef CONFIG_CPU_COPY_V6
-# define MULTI_USER 1
+# ifdef _USER
+#  define MULTI_USER 1
+# else
+#  define _USER v6
+# endif
 #endif
 
-#if !defined(_USER) && !defined(MULTI_USER)
+#ifndef _USER
 #error Unknown user operations model
 #endif