summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/highbank/timer.c
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-07-25 17:57:46 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-07-25 17:57:46 +0200
commit8b485ba12b0defa0c4ed3559789250238f8331a8 (patch)
treea1174810bef0d504370272918dca8d485ae2ae3b /arch/arm/cpu/armv7/highbank/timer.c
parent12607adcd5181a8f6eab885a5fe4ba2fa12ef92a (diff)
parentaaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (diff)
downloadblackbird-obmc-uboot-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.gz
blackbird-obmc-uboot-8b485ba12b0defa0c4ed3559789250238f8331a8.zip
Merge branch 'u-boot/master' into u-boot-arm/master
Diffstat (limited to 'arch/arm/cpu/armv7/highbank/timer.c')
-rw-r--r--arch/arm/cpu/armv7/highbank/timer.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/cpu/armv7/highbank/timer.c b/arch/arm/cpu/armv7/highbank/timer.c
index 832c0123e5..b61cd69bc6 100644
--- a/arch/arm/cpu/armv7/highbank/timer.c
+++ b/arch/arm/cpu/armv7/highbank/timer.c
@@ -3,18 +3,7 @@
*
* Based on arm926ejs/mx27/timer.c
*
- * 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.
- *
- * This program is distributed in the hope 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/>.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
OpenPOWER on IntegriCloud