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/xilinx_uartps.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/xilinx_uartps.c')
-rw-r--r-- | drivers/tty/serial/xilinx_uartps.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index 31a630ae0870..b9b2bc76bcac 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c | |||
@@ -1,14 +1,9 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0+ | ||
1 | /* | 2 | /* |
2 | * Cadence UART driver (found in Xilinx Zynq) | 3 | * Cadence UART driver (found in Xilinx Zynq) |
3 | * | 4 | * |
4 | * 2011 - 2014 (C) Xilinx Inc. | 5 | * 2011 - 2014 (C) Xilinx Inc. |
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it | ||
7 | * and/or modify it under the terms of the GNU General Public | ||
8 | * License as published by the Free Software Foundation; | ||
9 | * either version 2 of the License, or (at your option) any | ||
10 | * later version. | ||
11 | * | ||
12 | * This driver has originally been pushed by Xilinx using a Zynq-branding. This | 7 | * This driver has originally been pushed by Xilinx using a Zynq-branding. This |
13 | * still shows in the naming of this file, the kconfig symbols and some symbols | 8 | * still shows in the naming of this file, the kconfig symbols and some symbols |
14 | * in the code. | 9 | * in the code. |
@@ -1673,7 +1668,7 @@ static void __exit cdns_uart_exit(void) | |||
1673 | uart_unregister_driver(&cdns_uart_uart_driver); | 1668 | uart_unregister_driver(&cdns_uart_uart_driver); |
1674 | } | 1669 | } |
1675 | 1670 | ||
1676 | module_init(cdns_uart_init); | 1671 | arch_initcall(cdns_uart_init); |
1677 | module_exit(cdns_uart_exit); | 1672 | module_exit(cdns_uart_exit); |
1678 | 1673 | ||
1679 | MODULE_DESCRIPTION("Driver for Cadence UART"); | 1674 | MODULE_DESCRIPTION("Driver for Cadence UART"); |