linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index dfa9475..416320d 100644 (file)
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -40,7 +40,6 @@
  *       v4wb          - ARMv4 with writeback cache, without minicache
  *       v4_mc         - ARMv4 with minicache
  *       xscale        - Xscale
- *       xsc3          - XScalev3
  */
 #undef _USER
 #undef MULTI_USER
@@ -85,14 +84,6 @@
 # endif
 #endif
 
-#ifdef CONFIG_CPU_XSC3
-# ifdef _USER
-#  define MULTI_USER 1
-# else
-#  define _USER xsc3_mc
-# endif
-#endif
-
 #ifdef CONFIG_CPU_COPY_V6
 # define MULTI_USER 1
 #endif
@@ -186,8 +177,6 @@ extern pmd_t *top_pmd;
 #define ARCH_SLAB_MINALIGN 8
 #endif
 
-#define devmem_is_allowed(x) 1
-
 #endif /* __KERNEL__ */
 
 #include <asm-generic/page.h>