diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-14 00:05:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-14 00:05:31 -0500 |
| commit | fb0255fb2941ef6f21742b2bc146d6b9aef4fedc (patch) | |
| tree | 8334f3485152b1c887ddfe04ba9a95c8a704481c /drivers/tty/serial/arc_uart.c | |
| parent | 449fcf3ab0baf3dde9952385e6789f2ca10c3980 (diff) | |
| parent | 57f5d648c45c3d40a3257c06629c14fd53c383bc (diff) | |
Merge tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial updates from Greg KH:
"Here is the big tty/serial driver pull request for 4.15-rc1.
Lots of serial driver updates in here, some small vt cleanups, and a
raft of SPDX and license boilerplate cleanups, messing up the diffstat
a bit.
Nothing major, with no realy functional changes except better hardware
support for some platforms.
All of these have been in linux-next for a while with no reported
issues"
* tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (110 commits)
tty: ehv_bytechan: fix spelling mistake
tty: serial: meson: allow baud-rates lower than 9600
serial: 8250_fintek: Fix crash with baud rate B0
serial: 8250_fintek: Disable delays for ports != 0
serial: 8250_fintek: Return -EINVAL on invalid configuration
tty: Remove redundant license text
tty: serdev: Remove redundant license text
tty: hvc: Remove redundant license text
tty: serial: Remove redundant license text
tty: add SPDX identifiers to all remaining files in drivers/tty/
tty: serial: jsm: remove redundant pointer ts
tty: serial: jsm: add space before the open parenthesis '('
tty: serial: jsm: fix coding style
tty: serial: jsm: delete space between function name and '('
tty: serial: jsm: add blank line after declarations
tty: serial: jsm: change the type of local variable
tty: serial: imx: remove dead code imx_dma_rxint
tty: serial: imx: disable ageing timer interrupt if dma in use
serial: 8250: fix potential deadlock in rs485-mode
serial: m32r_sio: Drop redundant .data assignment
...
Diffstat (limited to 'drivers/tty/serial/arc_uart.c')
| -rw-r--r-- | drivers/tty/serial/arc_uart.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c index 77fe306690c4..2599f9ecccfe 100644 --- a/drivers/tty/serial/arc_uart.c +++ b/drivers/tty/serial/arc_uart.c | |||
| @@ -1,12 +1,9 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0 | ||
| 1 | /* | 2 | /* |
| 2 | * ARC On-Chip(fpga) UART Driver | 3 | * ARC On-Chip(fpga) UART Driver |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2010-2012 Synopsys, Inc. (www.synopsys.com) | 5 | * Copyright (C) 2010-2012 Synopsys, Inc. (www.synopsys.com) |
| 5 | * | 6 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * vineetg: July 10th 2012 | 7 | * vineetg: July 10th 2012 |
| 11 | * -Decoupled the driver from arch/arc | 8 | * -Decoupled the driver from arch/arc |
| 12 | * +Using platform_get_resource() for irq/membase (thx to bfin_uart.c) | 9 | * +Using platform_get_resource() for irq/membase (thx to bfin_uart.c) |