diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-06-20 17:27:10 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-06-20 17:27:10 -0400 |
commit | 3b1d4ed5353af04d6aa20be2701727b9cdb2ac61 (patch) | |
tree | e4a3335c925abd933f1650e1ee4786e6bfad8f35 /arch/mips/mips-boards/sead | |
parent | 7c8545e98468c53809fc06788a3b9a34dff05240 (diff) |
[MIPS] Don't drag a platform specific header into generic arch code.
For some platforms it's definitions may conflict. So that's the one-liner.
The rest is 10 square kilometers of collateral damage fixup this include
used to paper over.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mips-boards/sead')
-rw-r--r-- | arch/mips/mips-boards/sead/sead_int.c | 2 | ||||
-rw-r--r-- | arch/mips/mips-boards/sead/sead_setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mips-boards/sead/sead_int.c b/arch/mips/mips-boards/sead/sead_int.c index c4b9de3a7f27..9ca0f82f1360 100644 --- a/arch/mips/mips-boards/sead/sead_int.c +++ b/arch/mips/mips-boards/sead/sead_int.c | |||
@@ -106,7 +106,7 @@ asmlinkage void plat_irq_dispatch(void) | |||
106 | irq = irq_ffs(pending); | 106 | irq = irq_ffs(pending); |
107 | 107 | ||
108 | if (irq >= 0) | 108 | if (irq >= 0) |
109 | do_IRQ(MIPSCPU_INT_BASE + irq); | 109 | do_IRQ(MIPS_CPU_IRQ_BASE + irq); |
110 | else | 110 | else |
111 | spurious_interrupt(); | 111 | spurious_interrupt(); |
112 | } | 112 | } |
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c index 811aba100605..bb801409d39b 100644 --- a/arch/mips/mips-boards/sead/sead_setup.c +++ b/arch/mips/mips-boards/sead/sead_setup.c | |||
@@ -68,7 +68,7 @@ static void __init serial_init(void) | |||
68 | #else | 68 | #else |
69 | s.iobase = SEAD_UART0_REGS_BASE+3; | 69 | s.iobase = SEAD_UART0_REGS_BASE+3; |
70 | #endif | 70 | #endif |
71 | s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0; | 71 | s.irq = MIPS_CPU_IRQ_BASE + MIPSCPU_INT_UART0; |
72 | s.uartclk = SEAD_BASE_BAUD * 16; | 72 | s.uartclk = SEAD_BASE_BAUD * 16; |
73 | s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ; | 73 | s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ; |
74 | s.iotype = UPIO_PORT; | 74 | s.iotype = UPIO_PORT; |