X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Fpage.h;h=4ca3a8e9348f53becec9d7969d8c73d0f64a3d3a;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=a270052fe67a26edeedfcd1e7b105ab36dd429f0;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

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