From 452785ed57ec536d8ec14d005612ca3712323a1f Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 27 Sep 2006 16:14:54 +0900
Subject: [PATCH] --- yaml --- r: 36272 b: refs/heads/master c:
 a328ff9a7e3109919f59ce1903a31f8b2e6339e5 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/sh/boards/se/73180/setup.c   | 2 ++
 trunk/arch/sh/configs/se73180_defconfig | 1 +
 trunk/arch/sh/mm/Kconfig                | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c25856d27735..205e078f7dc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 848dd265947c976b6340027088c090ff7f0a0b8b
+refs/heads/master: a328ff9a7e3109919f59ce1903a31f8b2e6339e5
diff --git a/trunk/arch/sh/boards/se/73180/setup.c b/trunk/arch/sh/boards/se/73180/setup.c
index cddc7a2b858f..4daf53b1457f 100644
--- a/trunk/arch/sh/boards/se/73180/setup.c
+++ b/trunk/arch/sh/boards/se/73180/setup.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <asm/machvec.h>
 #include <asm/se73180.h>
+#include <asm/irq.h>
 
 void heartbeat_73180se(void);
 void init_73180se_IRQ(void);
@@ -50,6 +51,7 @@ struct sh_machine_vector mv_73180se __initmv = {
 	.mv_outsl = sh73180se_outsl,
 
 	.mv_init_irq = init_73180se_IRQ,
+	.mv_irq_demux = shmse_irq_demux,
 #ifdef CONFIG_HEARTBEAT
 	.mv_heartbeat = heartbeat_73180se,
 #endif
diff --git a/trunk/arch/sh/configs/se73180_defconfig b/trunk/arch/sh/configs/se73180_defconfig
index d217e44c89a6..fe19feb95ca9 100644
--- a/trunk/arch/sh/configs/se73180_defconfig
+++ b/trunk/arch/sh/configs/se73180_defconfig
@@ -78,6 +78,7 @@ CONFIG_SH_73180_SOLUTION_ENGINE=y
 # CONFIG_SH_SECUREEDGE5410 is not set
 # CONFIG_SH_HS7751RVOIP is not set
 # CONFIG_SH_RTS7751R2D is not set
+# CONFIG_SH_R7780RP is not set
 # CONFIG_SH_EDOSK7705 is not set
 # CONFIG_SH_SH4202_MICRODEV is not set
 # CONFIG_SH_UNKNOWN is not set
diff --git a/trunk/arch/sh/mm/Kconfig b/trunk/arch/sh/mm/Kconfig
index fb586b1cf8bb..9064dfc91e6d 100644
--- a/trunk/arch/sh/mm/Kconfig
+++ b/trunk/arch/sh/mm/Kconfig
@@ -20,7 +20,6 @@ config CPU_SH4
 config CPU_SH4A
 	bool
 	select CPU_SH4
-	select CPU_HAS_INTC2_IRQ
 
 config CPU_SUBTYPE_ST40
 	bool
@@ -144,6 +143,7 @@ config CPU_SUBTYPE_SH7770
 config CPU_SUBTYPE_SH7780
 	bool "Support SH7780 processor"
 	select CPU_SH4A
+	select CPU_HAS_INTC2_IRQ
 
 endmenu