X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Fpage.h;h=416320d95419579178b82ea6aba75a381be7e706;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=dfa9475851c85c18e04a77f6aeef806a93130a11;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index dfa947585..416320d95 100644
--- 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>