From 669f79e256d0c453b35629453da00c40de1ee3fd Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Thu, 24 Jul 2008 00:25:12 +0900
Subject: [PATCH] --- yaml --- r: 107151 b: refs/heads/master c:
 a0e31fb09056224c5d6fef09d25cb96b6149aa7c h: refs/heads/master i:   107149:
 515f5b2cbd848d3aa3442062fa146faed64e5c28   107147:
 64dc4412844d167c958d7b2f952ccf21bd8ebac6   107143:
 a13dd3f5daaa6cf0612dbabc5b9457a01225bd19   107135:
 7c5d1f0dd07b7cc4f2e7392da273113e03e60ae3 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/mips/txx9/jmr3927/setup.c | 2 +-
 trunk/include/asm-mips/txx9irq.h     | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 53de7ffa4b2a..e5dcaf7af086 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b32d6d00ca890ebb204da1260247c11bba042b3
+refs/heads/master: a0e31fb09056224c5d6fef09d25cb96b6149aa7c
diff --git a/trunk/arch/mips/txx9/jmr3927/setup.c b/trunk/arch/mips/txx9/jmr3927/setup.c
index 03647ebe4130..57dc91e7afa6 100644
--- a/trunk/arch/mips/txx9/jmr3927/setup.c
+++ b/trunk/arch/mips/txx9/jmr3927/setup.c
@@ -85,7 +85,7 @@ static void jmr3927_machine_power_off(void)
 static void __init jmr3927_time_init(void)
 {
 	txx9_clockevent_init(TX3927_TMR_REG(0),
-			     TXX9_IRQ_BASE + JMR3927_IRQ_IRC_TMR(0),
+			     JMR3927_IRQ_IRC_TMR(0),
 			     JMR3927_IMCLK);
 	txx9_clocksource_init(TX3927_TMR_REG(1), JMR3927_IMCLK);
 }
diff --git a/trunk/include/asm-mips/txx9irq.h b/trunk/include/asm-mips/txx9irq.h
index 1c439e51b875..5620879be37f 100644
--- a/trunk/include/asm-mips/txx9irq.h
+++ b/trunk/include/asm-mips/txx9irq.h
@@ -14,8 +14,12 @@
 #ifdef CONFIG_IRQ_CPU
 #define TXX9_IRQ_BASE	(MIPS_CPU_IRQ_BASE + 8)
 #else
+#ifdef CONFIG_I8259
+#define TXX9_IRQ_BASE	(I8259A_IRQ_BASE + 16)
+#else
 #define TXX9_IRQ_BASE	0
 #endif
+#endif
 
 #ifdef CONFIG_CPU_TX39XX
 #define TXx9_MAX_IR 16