summaryrefslogtreecommitdiffstats
path: root/arch/mips/loongson64/common/serial.c
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2019-10-23 17:14:11 +0200
committerSean Paul <seanpaul@chromium.org>2019-10-23 17:14:11 +0200
commit44bf67f32a6803339ac1ba721b158c3e2272cabe (patch)
tree1ed93503a4a1d20005b85df91bd81e5f5982f348 /arch/mips/loongson64/common/serial.c
parentRevert "drm/omap: add OMAP_BO flags to affect buffer allocation" (diff)
parentMerge v5.4-rc4 into drm-next (diff)
downloadlinux-44bf67f32a6803339ac1ba721b158c3e2272cabe.tar.xz
linux-44bf67f32a6803339ac1ba721b158c3e2272cabe.zip
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 'arch/mips/loongson64/common/serial.c')
-rw-r--r--arch/mips/loongson64/common/serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/loongson64/common/serial.c b/arch/mips/loongson64/common/serial.c
index ffefc1cb2612..98c3a7feb10f 100644
--- a/arch/mips/loongson64/common/serial.c
+++ b/arch/mips/loongson64/common/serial.c
@@ -110,7 +110,7 @@ static int __init serial_init(void)
}
module_init(serial_init);
-static void __init serial_exit(void)
+static void __exit serial_exit(void)
{
platform_device_unregister(&uart8250_device);
}