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
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
memory.h
diff --git
a/arch/arm/include/asm/memory.h
b/arch/arm/include/asm/memory.h
index c3b2afd907761ddf73805f06cb783be319728830..1864ab9fb55ec18d2a3be8da88722f93d19ede58 100644
(file)
--- a/
arch/arm/include/asm/memory.h
+++ b/
arch/arm/include/asm/memory.h
@@
-14,7
+14,6
@@
#if 0 /* XXX###XXX */
-#include <linux/config.h>
#include <asm/arch/memory.h>
/*