Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / sh / kernel / cpu / irq / intc2.c

diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c
index 74defe76a0580c163f2f883c495c78db05c2448d..d8e22f4ff0f0a517497307fa45f4f1ff5322c4cf 100644 (file)
--- a/arch/sh/kernel/cpu/irq/intc2.c
+++ b/arch/sh/kernel/cpu/irq/intc2.c
@@ -18,7 +18,8 @@
 #define INTC2_BASE     0xfe080000
 #define INTC2_INTMSK   (INTC2_BASE + 0x40)
 #define INTC2_INTMSKCLR        (INTC2_BASE + 0x60)
-#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define INTC2_BASE     0xffd40000
 #define INTC2_INTMSK   (INTC2_BASE + 0x38)
 #define INTC2_INTMSKCLR        (INTC2_BASE + 0x3c)