summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/4xx_pcie.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/powerpc/include/asm/4xx_pcie.h
parent12607adcd5181a8f6eab885a5fe4ba2fa12ef92a (diff)
parentaaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (diff)
downloadtalos-obmc-uboot-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.gz
talos-obmc-uboot-8b485ba12b0defa0c4ed3559789250238f8331a8.zip
Merge branch 'u-boot/master' into u-boot-arm/master
Diffstat (limited to 'arch/powerpc/include/asm/4xx_pcie.h')
-rw-r--r--arch/powerpc/include/asm/4xx_pcie.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/4xx_pcie.h b/arch/powerpc/include/asm/4xx_pcie.h
index fbdc28e0a5..26b532ad69 100644
--- a/arch/powerpc/include/asm/4xx_pcie.h
+++ b/arch/powerpc/include/asm/4xx_pcie.h
@@ -2,10 +2,7 @@
* Copyright (c) 2005 Cisco Systems. All rights reserved.
* Roland Dreier <rolandd@cisco.com>
*
- * 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 __4XX_PCIE_H
OpenPOWER on IntegriCloud