diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /drivers/clocksource/timer-fsl-ftm.c | |
parent | 1b961423158caaae49d3900b7c9c37477bbfa9b3 (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
download | talos-op-linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.tar.gz talos-op-linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.zip |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'drivers/clocksource/timer-fsl-ftm.c')
-rw-r--r-- | drivers/clocksource/timer-fsl-ftm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/clocksource/timer-fsl-ftm.c b/drivers/clocksource/timer-fsl-ftm.c index e1c34b2f53a5..a9d9a3ca5996 100644 --- a/drivers/clocksource/timer-fsl-ftm.c +++ b/drivers/clocksource/timer-fsl-ftm.c @@ -1,12 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale FlexTimer Module (FTM) timer driver. * * Copyright 2014 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. */ #include <linux/clk.h> |