diff options
| author | Benjamin Herrenschmidt | 2009-10-27 23:56:18 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2009-10-27 23:56:18 +0100 |
| commit | 40578fca24e7f777f3da7a693b030ae28ef7e486 (patch) | |
| tree | ed0541f857882f647bfc97e03d83371b8f4698a6 /drivers/serial | |
| parent | powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule (diff) | |
| parent | powerpc/5200: Update defconfigs (diff) | |
| download | kernel-qcow2-linux-40578fca24e7f777f3da7a693b030ae28ef7e486.tar.gz kernel-qcow2-linux-40578fca24e7f777f3da7a693b030ae28ef7e486.tar.xz kernel-qcow2-linux-40578fca24e7f777f3da7a693b030ae28ef7e486.zip | |
Merge commit 'gcl/merge' into merge
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index d7bcd074d383..7ce9e9f567a3 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c @@ -705,7 +705,7 @@ mpc52xx_uart_verify_port(struct uart_port *port, struct serial_struct *ser) return -EINVAL; if ((ser->irq != port->irq) || - (ser->io_type != SERIAL_IO_MEM) || + (ser->io_type != UPIO_MEM) || (ser->baud_base != port->uartclk) || (ser->iomem_base != (void *)port->mapbase) || (ser->hub6 != 0)) |