diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 17:40:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 17:40:52 -0400 |
commit | 044f620ac65d0d90727cdbd0c058e4d150d62ddc (patch) | |
tree | 89bcf2829803979ff8384d14c159daebabc3244d /arch/mips/mips-boards/sead/sead_setup.c | |
parent | c53ab5d56c66816fe06dc6cd0abb93f6dd81a145 (diff) | |
parent | 3b1d4ed5353af04d6aa20be2701727b9cdb2ac61 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Don't drag a platform specific header into generic arch code.
Diffstat (limited to 'arch/mips/mips-boards/sead/sead_setup.c')
-rw-r--r-- | arch/mips/mips-boards/sead/sead_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |