diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 07:08:56 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 07:08:56 -0500 |
| commit | 847b9d01474f710e7a018186917d05e59e258309 (patch) | |
| tree | c0da8777ce350c4b048aa6ed2c41fdd109c42e92 /drivers/serial/amba-pl010.c | |
| parent | d1d051b28e9d3c3bed0bd15a2b49df3d04f7768f (diff) | |
| parent | a6df590dd8b7644c8e298e3b13442bcd6ceeb739 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/serial/amba-pl010.c')
| -rw-r--r-- | drivers/serial/amba-pl010.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 3490022e9fdc..429de2723a1c 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
| @@ -566,7 +566,7 @@ static struct uart_amba_port amba_ports[UART_NR] = { | |||
| 566 | .uartclk = 14745600, | 566 | .uartclk = 14745600, |
| 567 | .fifosize = 16, | 567 | .fifosize = 16, |
| 568 | .ops = &amba_pl010_pops, | 568 | .ops = &amba_pl010_pops, |
| 569 | .flags = ASYNC_BOOT_AUTOCONF, | 569 | .flags = UPF_BOOT_AUTOCONF, |
| 570 | .line = 0, | 570 | .line = 0, |
| 571 | }, | 571 | }, |
| 572 | .dtr_mask = 1 << 5, | 572 | .dtr_mask = 1 << 5, |
| @@ -581,7 +581,7 @@ static struct uart_amba_port amba_ports[UART_NR] = { | |||
| 581 | .uartclk = 14745600, | 581 | .uartclk = 14745600, |
| 582 | .fifosize = 16, | 582 | .fifosize = 16, |
| 583 | .ops = &amba_pl010_pops, | 583 | .ops = &amba_pl010_pops, |
| 584 | .flags = ASYNC_BOOT_AUTOCONF, | 584 | .flags = UPF_BOOT_AUTOCONF, |
| 585 | .line = 1, | 585 | .line = 1, |
| 586 | }, | 586 | }, |
| 587 | .dtr_mask = 1 << 7, | 587 | .dtr_mask = 1 << 7, |