From 4ddbfd2100780a5bf516b407103ad288801a8290 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 12 Jul 2007 17:41:14 +0100
Subject: [PATCH] --- yaml --- r: 58873 b: refs/heads/master c:
 a74b4605181595c633ff4cfd44949886b0918172 h: refs/heads/master i:   58871:
 86ea4aabe2117426742386cd87ef33f98a756976 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/mips/mipssim/sim_int.c   | 2 +-
 trunk/arch/mips/mipssim/sim_setup.c | 2 +-
 trunk/arch/mips/mipssim/sim_time.c  | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 48b1770c3d84..da5a7acc7fc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 891649409edbed528728b4a104d29e43e9d7473a
+refs/heads/master: a74b4605181595c633ff4cfd44949886b0918172
diff --git a/trunk/arch/mips/mipssim/sim_int.c b/trunk/arch/mips/mipssim/sim_int.c
index d86b37235cf6..5cbc3509ab52 100644
--- a/trunk/arch/mips/mipssim/sim_int.c
+++ b/trunk/arch/mips/mipssim/sim_int.c
@@ -77,7 +77,7 @@ asmlinkage void plat_irq_dispatch(void)
 	irq = irq_ffs(pending);
 
 	if (irq > 0)
-		do_IRQ(MIPSCPU_INT_BASE + irq);
+		do_IRQ(MIPS_CPU_IRQ_BASE + irq);
 	else
 		spurious_interrupt();
 }
diff --git a/trunk/arch/mips/mipssim/sim_setup.c b/trunk/arch/mips/mipssim/sim_setup.c
index 3643582bdade..60e66906be65 100644
--- a/trunk/arch/mips/mipssim/sim_setup.c
+++ b/trunk/arch/mips/mipssim/sim_setup.c
@@ -84,7 +84,7 @@ static void __init serial_init(void)
 	/* hardware int 4 - the serial int, is CPU int 6
 	 but poll for now */
 	s.irq =  0;
-	s.uartclk = BASE_BAUD * 16;
+	s.uartclk = 1843200;
 	s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
 	s.iotype = UPIO_PORT;
 	s.regshift = 0;
diff --git a/trunk/arch/mips/mipssim/sim_time.c b/trunk/arch/mips/mipssim/sim_time.c
index 874a18e8ac24..a0f5a5dca1b2 100644
--- a/trunk/arch/mips/mipssim/sim_time.c
+++ b/trunk/arch/mips/mipssim/sim_time.c
@@ -5,7 +5,6 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/mc146818rtc.h>
-#include <linux/mipsregs.h>
 #include <linux/smp.h>
 #include <linux/timex.h>