projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-i2c
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
pxa
/
start.S
diff --git
a/arch/arm/cpu/pxa/start.S
b/arch/arm/cpu/pxa/start.S
index a136ed83fd9e2c27e8bf2825dbc5daa7603f5b5c..ae358a56e61f816d4c87930a022f07c5e7ba48e8 100644
(file)
--- 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