diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
| commit | 92ad6325cb891bb455487bfe90cc47d18aa6ec37 (patch) | |
| tree | 433a7ef938fae69789216043f67eff9f9c6b0c68 /drivers/clocksource/timer-keystone.c | |
| parent | e0effb5fbd56a8b2b8917611cbf4fcd9aba92b8f (diff) | |
| parent | c356dc4b540edd6c02b409dd8cf3208ba2804c38 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor SPDX change conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/clocksource/timer-keystone.c')
| -rw-r--r-- | drivers/clocksource/timer-keystone.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/clocksource/timer-keystone.c b/drivers/clocksource/timer-keystone.c index f5b2eda30bf3..fea8a4f85669 100644 --- a/drivers/clocksource/timer-keystone.c +++ b/drivers/clocksource/timer-keystone.c | |||
| @@ -1,14 +1,10 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* | 2 | /* |
| 2 | * Keystone broadcast clock-event | 3 | * Keystone broadcast clock-event |
| 3 | * | 4 | * |
| 4 | * Copyright 2013 Texas Instruments, Inc. | 5 | * Copyright 2013 Texas Instruments, Inc. |
| 5 | * | 6 | * |
| 6 | * Author: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> | 7 | * Author: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> |
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | */ | 8 | */ |
| 13 | 9 | ||
| 14 | #include <linux/clk.h> | 10 | #include <linux/clk.h> |