diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-27 03:04:29 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-27 03:04:29 +0400 |
| commit | fc915c8b930c3114f2a838f7e2cd8789ad6fedc3 (patch) | |
| tree | 795197f8ec2bc5ba42ee975ecd4d5a16c64e063c /drivers/tty/serial/8250 | |
| parent | fe89def79c48e2149abdd1e816523e69a9067191 (diff) | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
| download | linux-fc915c8b930c3114f2a838f7e2cd8789ad6fedc3.tar.xz | |
Merge 3.5-rc4 into tty-next
This is to pick up the serial port and tty changes in Linus's tree to allow
everyone to sync up.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250')
| -rw-r--r-- | drivers/tty/serial/8250/8250.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c index 349d12c55169..8123f784bcda 100644 --- a/drivers/tty/serial/8250/8250.c +++ b/drivers/tty/serial/8250/8250.c @@ -3121,7 +3121,7 @@ static struct uart_8250_port *serial8250_find_match_or_unused(struct uart_port * /** * serial8250_register_8250_port - register a serial port - * @port: serial port template + * @up: serial port template * * Configure the serial port specified by the request. If the * port exists and is in use, it is hung up and unregistered |