git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
mips
/
mips-boards
/
atlas
/
atlas_setup.c
diff --git
a/arch/mips/mips-boards/atlas/atlas_setup.c
b/arch/mips/mips-boards/atlas/atlas_setup.c
index
9871a91
..
0c6b0ce
100644
(file)
--- a/
arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/
arch/mips/mips-boards/atlas/atlas_setup.c
@@
-77,7
+77,7
@@
static void __init serial_init(void)
#else
s.iobase = ATLAS_UART_REGS_BASE+3;
#endif
- s.irq = ATLASINT_UART;
+ s.irq = ATLAS
_
INT_UART;
s.uartclk = ATLAS_BASE_BAUD * 16;
s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
s.iotype = UPIO_PORT;