aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/clk-axi-clkgen.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-09 09:11:21 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-09 09:11:21 +0200
commit0154ec71d597692a0d0682b19eac4b3adfb7f3dc (patch)
tree121b4ac35146f5696da090d3ae2534c76523e6c2 /drivers/clk/clk-axi-clkgen.c
parentVMCI: Fixup atomic64_t abuse (diff)
parentLinux 5.2-rc4 (diff)
downloadlinux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.tar.xz
linux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.zip
Merge 5.2-rc4 into char-misc-next
We want the char/misc driver fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/clk-axi-clkgen.c')
-rw-r--r--drivers/clk/clk-axi-clkgen.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/clk-axi-clkgen.c b/drivers/clk/clk-axi-clkgen.c
index 48d11f2598e8..96f351785b41 100644
--- a/drivers/clk/clk-axi-clkgen.c
+++ b/drivers/clk/clk-axi-clkgen.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* AXI clkgen driver
*
* Copyright 2012-2013 Analog Devices Inc.
* Author: Lars-Peter Clausen <lars@metafoo.de>
- *
- * Licensed under the GPL-2.
- *
*/
#include <linux/platform_device.h>