Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6] / include / asm-arm / arch-ixp4xx / ixp4xx-regs.h

diff --git a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
index deb989950c52d6bef5c682680257b164386283dc..5d949d763a918810571f46f5b163cb61a740ca2a 100644 (file)
--- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
@@ -607,47 +607,4 @@
 
 #define DCMD_LENGTH    0x01fff         /* length mask (max = 8K - 1) */
 
-/* Processor id value in CP15 Register 0 */
-#define IXP425_PROCESSOR_ID_VALUE      0x690541c0
-#define IXP435_PROCESSOR_ID_VALUE      0x69054040
-#define IXP465_PROCESSOR_ID_VALUE      0x69054200
-#define IXP4XX_PROCESSOR_ID_MASK       0xfffffff0
-
-#ifndef __ASSEMBLY__
-static inline int cpu_is_ixp42x(void)
-{
-       extern unsigned int processor_id;
-
-       if ((processor_id & IXP4XX_PROCESSOR_ID_MASK) ==
-            IXP425_PROCESSOR_ID_VALUE )
-               return 1;
-
-       return 0;
-}
-
-static inline int cpu_is_ixp43x(void)
-{
-#ifdef CONFIG_CPU_IXP43X
-       extern unsigned int processor_id;
-
-       if ((processor_id & IXP4XX_PROCESSOR_ID_MASK) ==
-            IXP435_PROCESSOR_ID_VALUE )
-               return 1;
-#endif
-       return 0;
-}
-
-static inline int cpu_is_ixp46x(void)
-{
-#ifdef CONFIG_CPU_IXP46X
-       extern unsigned int processor_id;
-
-       if ((processor_id & IXP4XX_PROCESSOR_ID_MASK) ==
-            IXP465_PROCESSOR_ID_VALUE )
-               return 1;
-#endif
-       return 0;
-}
-#endif
-
 #endif