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 'u-boot-imx/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-at91
/
hardware.h
diff --git
a/arch/arm/include/asm/arch-at91/hardware.h
b/arch/arm/include/asm/arch-at91/hardware.h
index a63f97406020753baf0efd7ee936b747d9446bdf..d712a0dc9136c47f52eed8cbed253114163a7952 100644
(file)
--- a/
arch/arm/include/asm/arch-at91/hardware.h
+++ b/
arch/arm/include/asm/arch-at91/hardware.h
@@
-25,8
+25,6
@@
# include <asm/arch/at91sam9x5.h>
#elif defined(CONFIG_AT91CAP9)
# include <asm/arch/at91cap9.h>
# include <asm/arch/at91sam9x5.h>
#elif defined(CONFIG_AT91CAP9)
# include <asm/arch/at91cap9.h>
-#elif defined(CONFIG_AT91X40)
-# include <asm/arch/at91x40.h>
#elif defined(CONFIG_SAMA5D3)
# include <asm/arch/sama5d3.h>
#else
#elif defined(CONFIG_SAMA5D3)
# include <asm/arch/sama5d3.h>
#else