summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/zx2967_wdt.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-06-03 11:50:18 +0200
committerIngo Molnar <mingo@kernel.org>2019-06-03 11:50:18 +0200
commit26b73da3604cc1a6596406d136b14d1a01c3676f (patch)
treec7839809e35fce4868910742157e8ef96782b378 /drivers/watchdog/zx2967_wdt.c
parentfutex: Consolidate duplicated timer setup code (diff)
parentLinux 5.2-rc3 (diff)
downloadlinux-26b73da3604cc1a6596406d136b14d1a01c3676f.tar.xz
linux-26b73da3604cc1a6596406d136b14d1a01c3676f.zip
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/watchdog/zx2967_wdt.c')
-rw-r--r--drivers/watchdog/zx2967_wdt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/zx2967_wdt.c b/drivers/watchdog/zx2967_wdt.c
index c8549bf07cc9..bf183e73671a 100644
--- a/drivers/watchdog/zx2967_wdt.c
+++ b/drivers/watchdog/zx2967_wdt.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* watchdog driver for ZTE's zx2967 family
*
* Copyright (C) 2017 ZTE Ltd.
*
* Author: Baoyou Xie <baoyou.xie@linaro.org>
- *
- * License terms: GNU General Public License (GPL) version 2
*/
#include <linux/clk.h>