diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 15:21:22 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 15:21:22 -0800 |
commit | 17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch) | |
tree | 8fe4fc7a987547c546e7b493eecb3607a9583795 /arch/ppc/platforms/chestnut.c | |
parent | cce0cac125623f9b68f25dd1350f6d616220a8dd (diff) | |
parent | 85d1494e5ff8e20a52ce514584ffda4f0265025e (diff) | |
download | op-kernel-dev-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.zip op-kernel-dev-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.tar.gz |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/ppc/platforms/chestnut.c')
-rw-r--r-- | arch/ppc/platforms/chestnut.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/chestnut.c b/arch/ppc/platforms/chestnut.c index 48a4a51..aefcc0e 100644 --- a/arch/ppc/platforms/chestnut.c +++ b/arch/ppc/platforms/chestnut.c @@ -116,7 +116,7 @@ chestnut_early_serial_map(void) port.uartclk = BASE_BAUD * 16; port.irq = UART0_INT; port.flags = STD_COM_FLAGS | UPF_IOREMAP; - port.iotype = SERIAL_IO_MEM; + port.iotype = UPIO_MEM; port.mapbase = CHESTNUT_UART0_IO_BASE; port.regshift = 0; |