summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-13 14:43:57 +0200
committerWolfgang Denk <wd@denx.de>2008-07-13 14:43:57 +0200
commitdc42c7c08000f97651b763ab5b614e5f74c443ee (patch)
tree143214da7c575b48af89514ce4b2d4bc3cb6757d /cpu
parent17bd17071463b0cde391ac4a0863d600474b4ea1 (diff)
parentaf577da58642b81eb94067e3d9e9dc6998cd620d (diff)
downloadu-boot-imx-dc42c7c08000f97651b763ab5b614e5f74c443ee.zip
u-boot-imx-dc42c7c08000f97651b763ab5b614e5f74c443ee.tar.gz
u-boot-imx-dc42c7c08000f97651b763ab5b614e5f74c443ee.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ppc4xx/4xx_pcie.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpu/ppc4xx/4xx_pcie.c b/cpu/ppc4xx/4xx_pcie.c
index d50a538..9803fcc 100644
--- a/cpu/ppc4xx/4xx_pcie.c
+++ b/cpu/ppc4xx/4xx_pcie.c
@@ -25,11 +25,11 @@
#define DEBUG
#endif
-#include <asm/processor.h>
-#include <asm-ppc/io.h>
-#include <ppc4xx.h>
#include <common.h>
#include <pci.h>
+#include <ppc4xx.h>
+#include <asm/processor.h>
+#include <asm-ppc/io.h>
#if (defined(CONFIG_440SPE) || defined(CONFIG_405EX) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT)) && \