diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /drivers/serial/21285.c | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'drivers/serial/21285.c')
| -rw-r--r-- | drivers/serial/21285.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index 7aef7518b0d1..8c5c276c5577 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c | |||
| @@ -362,7 +362,7 @@ static struct uart_ops serial21285_ops = { | |||
| 362 | 362 | ||
| 363 | static struct uart_port serial21285_port = { | 363 | static struct uart_port serial21285_port = { |
| 364 | .mapbase = 0x42000160, | 364 | .mapbase = 0x42000160, |
| 365 | .iotype = SERIAL_IO_MEM, | 365 | .iotype = UPIO_MEM, |
| 366 | .irq = NO_IRQ, | 366 | .irq = NO_IRQ, |
| 367 | .fifosize = 16, | 367 | .fifosize = 16, |
| 368 | .ops = &serial21285_ops, | 368 | .ops = &serial21285_ops, |