diff options
-rw-r--r-- | arch/mips/txx9/jmr3927/setup.c | 2 | ||||
-rw-r--r-- | include/asm-mips/txx9irq.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c index 03647ebe4130..57dc91e7afa6 100644 --- a/arch/mips/txx9/jmr3927/setup.c +++ b/arch/mips/txx9/jmr3927/setup.c | |||
@@ -85,7 +85,7 @@ static void jmr3927_machine_power_off(void) | |||
85 | static void __init jmr3927_time_init(void) | 85 | static void __init jmr3927_time_init(void) |
86 | { | 86 | { |
87 | txx9_clockevent_init(TX3927_TMR_REG(0), | 87 | txx9_clockevent_init(TX3927_TMR_REG(0), |
88 | TXX9_IRQ_BASE + JMR3927_IRQ_IRC_TMR(0), | 88 | JMR3927_IRQ_IRC_TMR(0), |
89 | JMR3927_IMCLK); | 89 | JMR3927_IMCLK); |
90 | txx9_clocksource_init(TX3927_TMR_REG(1), JMR3927_IMCLK); | 90 | txx9_clocksource_init(TX3927_TMR_REG(1), JMR3927_IMCLK); |
91 | } | 91 | } |
diff --git a/include/asm-mips/txx9irq.h b/include/asm-mips/txx9irq.h index 1c439e51b875..5620879be37f 100644 --- a/include/asm-mips/txx9irq.h +++ b/include/asm-mips/txx9irq.h | |||
@@ -14,8 +14,12 @@ | |||
14 | #ifdef CONFIG_IRQ_CPU | 14 | #ifdef CONFIG_IRQ_CPU |
15 | #define TXX9_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8) | 15 | #define TXX9_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8) |
16 | #else | 16 | #else |
17 | #ifdef CONFIG_I8259 | ||
18 | #define TXX9_IRQ_BASE (I8259A_IRQ_BASE + 16) | ||
19 | #else | ||
17 | #define TXX9_IRQ_BASE 0 | 20 | #define TXX9_IRQ_BASE 0 |
18 | #endif | 21 | #endif |
22 | #endif | ||
19 | 23 | ||
20 | #ifdef CONFIG_CPU_TX39XX | 24 | #ifdef CONFIG_CPU_TX39XX |
21 | #define TXx9_MAX_IR 16 | 25 | #define TXx9_MAX_IR 16 |