diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-29 16:31:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-29 16:31:13 -0400 |
| commit | 9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04 (patch) | |
| tree | 64f5fdfc195e92081426db6185dbebe0f4373a81 /include | |
| parent | 92794a5d6359f9e8ed0d43fe0f3c653f748dcc90 (diff) | |
| parent | 0ed1507183adea174bc4b6611b50d90e044730c2 (diff) | |
Merge branch 'orion-fixes2'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/page.h | 8 |
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 @@ | |||
| 71 | # endif | 71 | # endif |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #ifdef CONFIG_CPU_COPY_FEROCEON | ||
| 75 | # ifdef _USER | ||
| 76 | # define MULTI_USER 1 | ||
| 77 | # else | ||
| 78 | # define _USER feroceon | ||
| 79 | # endif | ||
| 80 | #endif | ||
| 81 | |||
| 74 | #ifdef CONFIG_CPU_SA1100 | 82 | #ifdef CONFIG_CPU_SA1100 |
| 75 | # ifdef _USER | 83 | # ifdef _USER |
| 76 | # define MULTI_USER 1 | 84 | # define MULTI_USER 1 |