diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:21:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:21:22 -0500 |
| commit | 17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch) | |
| tree | 8fe4fc7a987547c546e7b493eecb3607a9583795 /arch/ppc/platforms/4xx/ocotea.c | |
| parent | cce0cac125623f9b68f25dd1350f6d616220a8dd (diff) | |
| parent | 85d1494e5ff8e20a52ce514584ffda4f0265025e (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/ppc/platforms/4xx/ocotea.c')
| -rw-r--r-- | arch/ppc/platforms/4xx/ocotea.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c index 73b2c98158f6..4f355b6acab2 100644 --- a/arch/ppc/platforms/4xx/ocotea.c +++ b/arch/ppc/platforms/4xx/ocotea.c | |||
| @@ -248,8 +248,8 @@ ocotea_early_serial_map(void) | |||
| 248 | port.irq = UART0_INT; | 248 | port.irq = UART0_INT; |
| 249 | port.uartclk = clocks.uart0; | 249 | port.uartclk = clocks.uart0; |
| 250 | port.regshift = 0; | 250 | port.regshift = 0; |
| 251 | port.iotype = SERIAL_IO_MEM; | 251 | port.iotype = UPIO_MEM; |
| 252 | port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 252 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
| 253 | port.line = 0; | 253 | port.line = 0; |
| 254 | 254 | ||
| 255 | if (early_serial_setup(&port) != 0) { | 255 | if (early_serial_setup(&port) != 0) { |