summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-13 14:42:55 +0200
committerWolfgang Denk <wd@denx.de>2008-07-13 14:42:55 +0200
commitaf577da58642b81eb94067e3d9e9dc6998cd620d (patch)
treedce2b4d6f8768573b4fd889ad932051c0b339942
parenta07351fdbad1a92746d75a195eaef25d146c7f87 (diff)
parentb578fb471444cbd7db1285701ba51343baaf73fb (diff)
downloadu-boot-imx-af577da58642b81eb94067e3d9e9dc6998cd620d.zip
u-boot-imx-af577da58642b81eb94067e3d9e9dc6998cd620d.tar.gz
u-boot-imx-af577da58642b81eb94067e3d9e9dc6998cd620d.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
-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)) && \