diff options
| author | Stefan Roese <sr@denx.de> | 2008-07-14 10:45:47 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-07-14 10:45:47 +0200 |
| commit | 4b326101d6cfaeab8250988bc4c7f51e6c92d719 (patch) | |
| tree | d04632af08591263f5cd6fc8a5c6ba8ac3d6d246 /cpu/ppc4xx | |
| parent | 69e2c6d0d13d7c8cf1612ac090bdc4c59ba6858e (diff) | |
| parent | d5996dd555edf52721b7691a4c59de016251ed39 (diff) | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'cpu/ppc4xx')
| -rw-r--r-- | cpu/ppc4xx/4xx_pcie.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpu/ppc4xx/4xx_pcie.c b/cpu/ppc4xx/4xx_pcie.c index d50a538e38..9803fcc768 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)) && \ |