summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-at91/at91_shdwn.h
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2013-07-31 11:30:38 +0200
committerStefano Babic <sbabic@denx.de>2013-07-31 11:30:38 +0200
commit326ea986ac150acdc7656d57fca647db80b50158 (patch)
tree15724288b8b6da3a98d934db8330bb964cdfdf36 /arch/arm/include/asm/arch-at91/at91_shdwn.h
parent4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff)
parentfdce7b633a1de24456226b18527cc7900c34282a (diff)
downloadblackbird-obmc-uboot-326ea986ac150acdc7656d57fca647db80b50158.tar.gz
blackbird-obmc-uboot-326ea986ac150acdc7656d57fca647db80b50158.zip
Merge git://git.denx.de/u-boot-arm
Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/include/asm/arch-at91/at91_shdwn.h')
-rw-r--r--arch/arm/include/asm/arch-at91/at91_shdwn.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91_shdwn.h b/arch/arm/include/asm/arch-at91/at91_shdwn.h
index 874f988700..18d9ea690e 100644
--- a/arch/arm/include/asm/arch-at91/at91_shdwn.h
+++ b/arch/arm/include/asm/arch-at91/at91_shdwn.h
@@ -5,10 +5,7 @@
* Shutdown Controller
* Based on AT91SAM9XE datasheet
*
- * 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 AT91_SHDWN_H
OpenPOWER on IntegriCloud