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/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
armv7
/
am33xx
/
Makefile
diff --git
a/arch/arm/cpu/armv7/am33xx/Makefile
b/arch/arm/cpu/armv7/am33xx/Makefile
index 966fcab71b477c1055013ab86d5d9dd489ecf48f..5566310d9481f68dc1b6191e6440f8c793b351df 100644
(file)
--- a/
arch/arm/cpu/armv7/am33xx/Makefile
+++ b/
arch/arm/cpu/armv7/am33xx/Makefile
@@
-19,4
+19,3
@@
obj-y += ddr.o
obj-y += emif4.o
obj-y += board.o
obj-y += mux.o
-obj-$(CONFIG_NAND_OMAP_GPMC) += elm.o