diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-10-27 18:56:18 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-10-27 18:56:18 -0400 |
| commit | 40578fca24e7f777f3da7a693b030ae28ef7e486 (patch) | |
| tree | ed0541f857882f647bfc97e03d83371b8f4698a6 /drivers/serial | |
| parent | 4f917ba3d5ee9c98d60fa357e799942df8412de3 (diff) | |
| parent | 4bdf0bb7d64cf672199519b3d808e2a82f5b59e9 (diff) | |
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) | |||
| 705 | return -EINVAL; | 705 | return -EINVAL; |
| 706 | 706 | ||
| 707 | if ((ser->irq != port->irq) || | 707 | if ((ser->irq != port->irq) || |
| 708 | (ser->io_type != SERIAL_IO_MEM) || | 708 | (ser->io_type != UPIO_MEM) || |
| 709 | (ser->baud_base != port->uartclk) || | 709 | (ser->baud_base != port->uartclk) || |
| 710 | (ser->iomem_base != (void *)port->mapbase) || | 710 | (ser->iomem_base != (void *)port->mapbase) || |
| 711 | (ser->hub6 != 0)) | 711 | (ser->hub6 != 0)) |