diff options
| author | Sean Paul <seanpaul@chromium.org> | 2019-10-23 11:14:11 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-10-23 11:14:11 -0400 |
| commit | 44bf67f32a6803339ac1ba721b158c3e2272cabe (patch) | |
| tree | 1ed93503a4a1d20005b85df91bd81e5f5982f348 /drivers/tty/serial/owl-uart.c | |
| parent | a96bf3cbd7b8557f5c5c7938e5f8926ea39d55e9 (diff) | |
| parent | 2e79e22e092acd55da0b2db066e4826d7d152c41 (diff) | |
Merge drm/drm-next into drm-misc-next
Parroting Daniel's backmerge justification from
2e79e22e092acd55da0b2db066e4826d7d152c41:
Thierry needs fd70c7755bf0 ("drm/bridge: tc358767: fix max_tu_symbol
value") to be able to merge his dp_link patch series.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/tty/serial/owl-uart.c')
| -rw-r--r-- | drivers/tty/serial/owl-uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/owl-uart.c b/drivers/tty/serial/owl-uart.c index 03963af77b15..d2d8b3494685 100644 --- a/drivers/tty/serial/owl-uart.c +++ b/drivers/tty/serial/owl-uart.c @@ -740,7 +740,7 @@ static int __init owl_uart_init(void) return ret; } -static void __init owl_uart_exit(void) +static void __exit owl_uart_exit(void) { platform_driver_unregister(&owl_uart_platform_driver); uart_unregister_driver(&owl_uart_driver); |