From 30fecc94375ef96b31e7a37ffdfa1aba01107496 Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Tue, 17 Jan 2012 11:20:23 -0600
Subject: [PATCH] --- yaml --- r: 297615 b: refs/heads/master c:
 7f1e76370b717be264f0af54719182a96fb8f36d h: refs/heads/master i:   297613:
 ac6c29bd0a5f869cfa861c6fb77e9cf851d3784b   297611:
 77efd96204c7f566cc9a9127fa00a39be25ac998   297607:
 2b98a40aa67f371252e74580898a8748c776dfb4   297599:
 1331ff4428382f3aadef20443aef2d387fe7b347 v: v3

---
 [refs]                                           |  2 +-
 trunk/arch/arm/mach-shmobile/Kconfig             |  4 ++++
 trunk/arch/arm/mach-shmobile/include/mach/irqs.h |  6 ++----
 trunk/arch/sh/include/asm/irq.h                  | 11 -----------
 trunk/include/linux/sh_intc.h                    | 11 +++++++++++
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index d3dadbddd912..1d5dc7594066 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc0a15171a75a67f22ba85baa607f1ffc10751e3
+refs/heads/master: 7f1e76370b717be264f0af54719182a96fb8f36d
diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig
index 060e5644c49c..34560cab45d9 100644
--- a/trunk/arch/arm/mach-shmobile/Kconfig
+++ b/trunk/arch/arm/mach-shmobile/Kconfig
@@ -100,6 +100,10 @@ config MACH_MARZEN
 
 comment "SH-Mobile System Configuration"
 
+config CPU_HAS_INTEVT
+        bool
+	default y
+
 menu "Memory configuration"
 
 config MEMORY_START
diff --git a/trunk/arch/arm/mach-shmobile/include/mach/irqs.h b/trunk/arch/arm/mach-shmobile/include/mach/irqs.h
index dcb714f4d75a..828807dce5a1 100644
--- a/trunk/arch/arm/mach-shmobile/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-shmobile/include/mach/irqs.h
@@ -1,15 +1,13 @@
 #ifndef __ASM_MACH_IRQS_H
 #define __ASM_MACH_IRQS_H
 
+#include <linux/sh_intc.h>
+
 #define NR_IRQS         1024
 
 /* GIC */
 #define gic_spi(nr)		((nr) + 32)
 
-/* INTCA */
-#define evt2irq(evt)		(((evt) >> 5) - 16)
-#define irq2evt(irq)		(((irq) + 16) << 5)
-
 /* INTCS */
 #define INTCS_VECT_BASE		0x2200
 #define INTCS_VECT(n, vect)	INTC_VECT((n), INTCS_VECT_BASE + (vect))
diff --git a/trunk/arch/sh/include/asm/irq.h b/trunk/arch/sh/include/asm/irq.h
index 45d08b6a5ef7..2a62017eb275 100644
--- a/trunk/arch/sh/include/asm/irq.h
+++ b/trunk/arch/sh/include/asm/irq.h
@@ -20,17 +20,6 @@
  */
 #define NO_IRQ_IGNORE		((unsigned int)-1)
 
-/*
- * Convert back and forth between INTEVT and IRQ values.
- */
-#ifdef CONFIG_CPU_HAS_INTEVT
-#define evt2irq(evt)		(((evt) >> 5) - 16)
-#define irq2evt(irq)		(((irq) + 16) << 5)
-#else
-#define evt2irq(evt)		(evt)
-#define irq2evt(irq)		(irq)
-#endif
-
 /*
  * Simple Mask Register Support
  */
diff --git a/trunk/include/linux/sh_intc.h b/trunk/include/linux/sh_intc.h
index b160645f5599..e1a2ac5c931b 100644
--- a/trunk/include/linux/sh_intc.h
+++ b/trunk/include/linux/sh_intc.h
@@ -3,6 +3,17 @@
 
 #include <linux/ioport.h>
 
+/*
+ * Convert back and forth between INTEVT and IRQ values.
+ */
+#ifdef CONFIG_CPU_HAS_INTEVT
+#define evt2irq(evt)		(((evt) >> 5) - 16)
+#define irq2evt(irq)		(((irq) + 16) << 5)
+#else
+#define evt2irq(evt)		(evt)
+#define irq2evt(irq)		(irq)
+#endif
+
 typedef unsigned char intc_enum;
 
 struct intc_vect {