[ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols

Make the cpu_is_pxaXXX() macros define to zero when support for a
particular CPU is disabled.  This allows us to eliminate code for
CPUs which aren't enabled.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index fc20d72d48442cd41ef50a9389f644ecb0607de9..89df077a7e247cad84713f4a8995804bd606ab12 100644 (file)
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -62,6 +62,7 @@
 
 #ifndef __ASSEMBLY__
 
+#ifdef CONFIG_PXA25x
 #define __cpu_is_pxa21x(id)                            \
        ({                                              \
                unsigned int _id = (id) >> 4 & 0xf3f;   \
@@ -73,30 +74,50 @@
                unsigned int _id = (id) >> 4 & 0xfff;   \
                _id == 0x2d0 || _id == 0x290;           \
        })
+#else
+#define __cpu_is_pxa21x(id)    (0)
+#define __cpu_is_pxa25x(id)    (0)
+#endif
 
+#ifdef CONFIG_PXA27x
 #define __cpu_is_pxa27x(id)                            \
        ({                                              \
                unsigned int _id = (id) >> 4 & 0xfff;   \
                _id == 0x411;                           \
        })
+#else
+#define __cpu_is_pxa27x(id)    (0)
+#endif
 
+#ifdef CONFIG_CPU_PXA300
 #define __cpu_is_pxa300(id)                            \
        ({                                              \
                unsigned int _id = (id) >> 4 & 0xfff;   \
                _id == 0x688;                           \
         })
+#else
+#define __cpu_is_pxa300(id)    (0)
+#endif
 
+#ifdef CONFIG_CPU_PXA310
 #define __cpu_is_pxa310(id)                            \
        ({                                              \
                unsigned int _id = (id) >> 4 & 0xfff;   \
                _id == 0x689;                           \
         })
+#else
+#define __cpu_is_pxa310(id)    (0)
+#endif
 
+#ifdef CONFIG_CPU_PXA320
 #define __cpu_is_pxa320(id)                            \
        ({                                              \
                unsigned int _id = (id) >> 4 & 0xfff;   \
                _id == 0x603 || _id == 0x682;           \
         })
+#else
+#define __cpu_is_pxa320(id)    (0)
+#endif
 
 #define cpu_is_pxa21x()                                        \
        ({                                              \