summaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-04-29 21:31:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-29 21:31:13 +0100
commit9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04 (patch)
tree64f5fdfc195e92081426db6185dbebe0f4373a81 /include/asm-arm
parent92794a5d6359f9e8ed0d43fe0f3c653f748dcc90 (diff)
parent0ed1507183adea174bc4b6611b50d90e044730c2 (diff)
downloadlinux-9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04.tar.gz
linux-9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04.tar.bz2
linux-9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04.zip
Merge branch 'orion-fixes2'
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/page.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index c86f68ee6511..5c22b0112106 100644
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -71,6 +71,14 @@
# endif
#endif
+#ifdef CONFIG_CPU_COPY_FEROCEON
+# ifdef _USER
+# define MULTI_USER 1
+# else
+# define _USER feroceon
+# endif
+#endif
+
#ifdef CONFIG_CPU_SA1100
# ifdef _USER
# define MULTI_USER 1