X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-arm%2Fsystem.h;h=9c744ae6c6e3b8b9fb47c84524ee0e4c2fb200f1;hb=cee4cca740d209bcb4b9857baa2253d5ba4e3fbe;hp=95b3abf4851bb9cc70596edd3a239076910939ee;hpb=23bdf86aa06ebe71bcbf6b7d25de9958c6ab33fa;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 95b3abf4851..9c744ae6c6e 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -3,7 +3,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #define CPU_ARCH_UNKNOWN	0
 #define CPU_ARCH_ARMv3		1
@@ -127,6 +126,12 @@ static inline int cpu_is_xsc3(void)
 }
 #endif
 
+#if !defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_CPU_XSC3)
+#define	cpu_is_xscale()	0
+#else
+#define	cpu_is_xscale()	1
+#endif
+
 #define set_cr(x)					\
 	__asm__ __volatile__(				\
 	"mcr	p15, 0, %0, c1, c0, 0	@ set CR"	\