diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/mipssim/sim_int.c | 2 | ||||
-rw-r--r-- | arch/mips/mipssim/sim_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/mipssim/sim_time.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/mipssim/sim_int.c b/arch/mips/mipssim/sim_int.c index d86b37235cf6..5cbc3509ab52 100644 --- a/arch/mips/mipssim/sim_int.c +++ b/arch/mips/mipssim/sim_int.c | |||
@@ -77,7 +77,7 @@ asmlinkage void plat_irq_dispatch(void) | |||
77 | irq = irq_ffs(pending); | 77 | irq = irq_ffs(pending); |
78 | 78 | ||
79 | if (irq > 0) | 79 | if (irq > 0) |
80 | do_IRQ(MIPSCPU_INT_BASE + irq); | 80 | do_IRQ(MIPS_CPU_IRQ_BASE + irq); |
81 | else | 81 | else |
82 | spurious_interrupt(); | 82 | spurious_interrupt(); |
83 | } | 83 | } |
diff --git a/arch/mips/mipssim/sim_setup.c b/arch/mips/mipssim/sim_setup.c index 3643582bdade..60e66906be65 100644 --- a/arch/mips/mipssim/sim_setup.c +++ b/arch/mips/mipssim/sim_setup.c | |||
@@ -84,7 +84,7 @@ static void __init serial_init(void) | |||
84 | /* hardware int 4 - the serial int, is CPU int 6 | 84 | /* hardware int 4 - the serial int, is CPU int 6 |
85 | but poll for now */ | 85 | but poll for now */ |
86 | s.irq = 0; | 86 | s.irq = 0; |
87 | s.uartclk = BASE_BAUD * 16; | 87 | s.uartclk = 1843200; |
88 | s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; | 88 | s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
89 | s.iotype = UPIO_PORT; | 89 | s.iotype = UPIO_PORT; |
90 | s.regshift = 0; | 90 | s.regshift = 0; |
diff --git a/arch/mips/mipssim/sim_time.c b/arch/mips/mipssim/sim_time.c index 874a18e8ac24..a0f5a5dca1b2 100644 --- a/arch/mips/mipssim/sim_time.c +++ b/arch/mips/mipssim/sim_time.c | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
6 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
7 | #include <linux/mc146818rtc.h> | 7 | #include <linux/mc146818rtc.h> |
8 | #include <linux/mipsregs.h> | ||
9 | #include <linux/smp.h> | 8 | #include <linux/smp.h> |
10 | #include <linux/timex.h> | 9 | #include <linux/timex.h> |
11 | 10 | ||