diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-29 21:44:40 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 21:44:40 +0200 |
| commit | 1ecb758341bac03994ed045821f9c0f7d1686d07 (patch) | |
| tree | 255e22abde6a3c74b78be749b63f973bd351d458 /arch/arm/cpu | |
| parent | e03f31697478e9edd523f34b1ed54b6ff2cb7242 (diff) | |
| parent | 9b8081a4525b3b2b655ba71fdeea1cb265d413e8 (diff) | |
| download | u-boot-imx-1ecb758341bac03994ed045821f9c0f7d1686d07.zip u-boot-imx-1ecb758341bac03994ed045821f9c0f7d1686d07.tar.gz u-boot-imx-1ecb758341bac03994ed045821f9c0f7d1686d07.tar.bz2 | |
Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/pxa/start.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index a136ed8..ae358a5 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -33,7 +33,6 @@ #include <config.h> #include <version.h> #include <asm/arch/pxa-regs.h> -#include <asm/arch/macro.h> /* takes care the CP15 update has taken place */ .macro CPWAIT reg |