summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h
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/include/asm/arch-at91/at91sam9260_matrix.h
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/include/asm/arch-at91/at91sam9260_matrix.h')
-rw-r--r--arch/arm/include/asm/arch-at91/at91sam9260_matrix.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h b/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h
index be28ad1c1d..4755fa10bb 100644
--- a/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h
+++ b/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h
@@ -6,10 +6,7 @@
* Memory Controllers (MATRIX, EBI) - System peripherals registers.
* Based on AT91SAM9260 datasheet revision B.
*
- * 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.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef AT91SAM9260_MATRIX_H
OpenPOWER on IntegriCloud