Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 213517
b: refs/heads/master
c: 288e9fe
h: refs/heads/master
i:
  213515: 9e1ba3e
v: v3
  • Loading branch information
Anton Vorontsov authored and Greg Kroah-Hartman committed Oct 22, 2010
1 parent 64eefdb commit 33bfd49
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 99793c660c811309ae4ca94cc9cf1c2f34940197
refs/heads/master: 288e9feb51f428377d486e18a107c144554e5e40
4 changes: 2 additions & 2 deletions trunk/drivers/serial/altera_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp)
port->iotype = SERIAL_IO_MEM;
port->irq = platp[i].irq;
port->uartclk = platp[i].uartclk;
port->flags = ASYNC_BOOT_AUTOCONF;
port->flags = UPF_BOOT_AUTOCONF;
port->ops = &altera_uart_ops;
port->private_data = platp;
}
Expand Down Expand Up @@ -551,7 +551,7 @@ static int __devinit altera_uart_probe(struct platform_device *pdev)
port->iotype = SERIAL_IO_MEM;
port->uartclk = platp->uartclk;
port->ops = &altera_uart_ops;
port->flags = ASYNC_BOOT_AUTOCONF;
port->flags = UPF_BOOT_AUTOCONF;
port->private_data = platp;

uart_add_one_port(&altera_uart_driver, port);
Expand Down

0 comments on commit 33bfd49

Please sign in to comment.