diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-07-03 10:50:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-07-03 10:50:21 +0200 |
| commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
| tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /arch/nios2/lib/delay.c | |
| parent | 516337048fa40496ae5ca9863c367ec991a44d9a (diff) | |
| parent | 4a8f81b8c053aad250ee247b219904ada72df9a4 (diff) | |
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'arch/nios2/lib/delay.c')
| -rw-r--r-- | arch/nios2/lib/delay.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/nios2/lib/delay.c b/arch/nios2/lib/delay.c index 088119cd0cc5..f1e39c7f7439 100644 --- a/arch/nios2/lib/delay.c +++ b/arch/nios2/lib/delay.c @@ -1,17 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* Copyright Altera Corporation (C) 2014. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #include <linux/module.h> |