Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-pxa / include / mach / regs-intc.h

diff --git a/arch/arm/mach-pxa/include/mach/regs-intc.h b/arch/arm/mach-pxa/include/mach/regs-intc.h
index 68464ce1c1ea98c360d203cdb52b17e16acf9d4c..662288eb6f951548abc0fcc8984bcb9b1f36a65f 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/regs-intc.h
+++ b/arch/arm/mach-pxa/include/mach/regs-intc.h
@@ -27,8 +27,4 @@
 #define ICFP3          __REG(0x40D0013C)  /* Interrupt Controller FIQ Pending Register 3 */
 #define ICPR3          __REG(0x40D00140)  /* Interrupt Controller Pending Register 3 */
 
-#define IPR(x)         __REG(0x40D0001C + (x < 32 ? (x << 2)           \
-                               : (x < 64 ? (0x94 + ((x - 32) << 2))    \
-                               : (0x128 + ((x - 64) << 2)))))
-
 #endif /* __ASM_MACH_REGS_INTC_H */