diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-31 18:49:28 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-31 18:49:28 -0200 |
| commit | 638e174688f58200d0deb7435093435e7d737b09 (patch) | |
| tree | a2cd32dbb41daf0a5d4e69eff1805fd5574c292a /drivers/serial/sa1100.c | |
| parent | 8d58d773b745950ac912e028b3c81f4902fbf91d (diff) | |
| parent | d195ea4b1456192abe780fd773778cbe9f6d77ea (diff) | |
Merge branch 'origin'
Diffstat (limited to 'drivers/serial/sa1100.c')
| -rw-r--r-- | drivers/serial/sa1100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index 1bd93168f50..ff7b60b4de3 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c @@ -665,21 +665,21 @@ void __init sa1100_register_uart(int idx, int port) sa1100_ports[idx].port.membase = (void __iomem *)&Ser1UTCR0; sa1100_ports[idx].port.mapbase = _Ser1UTCR0; sa1100_ports[idx].port.irq = IRQ_Ser1UART; - sa1100_ports[idx].port.flags = ASYNC_BOOT_AUTOCONF; + sa1100_ports[idx].port.flags = UPF_BOOT_AUTOCONF; break; case 2: sa1100_ports[idx].port.membase = (void __iomem *)&Ser2UTCR0; sa1100_ports[idx].port.mapbase = _Ser2UTCR0; sa1100_ports[idx].port.irq = IRQ_Ser2ICP; - sa1100_ports[idx].port.flags = ASYNC_BOOT_AUTOCONF; + sa1100_ports[idx].port.flags = UPF_BOOT_AUTOCONF; break; case 3: sa1100_ports[idx].port.membase = (void __iomem *)&Ser3UTCR0; sa1100_ports[idx].port.mapbase = _Ser3UTCR0; sa1100_ports[idx].port.irq = IRQ_Ser3UART; - sa1100_ports[idx].port.flags = ASYNC_BOOT_AUTOCONF; + sa1100_ports[idx].port.flags = UPF_BOOT_AUTOCONF; break; default: |