git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'aspeed/dt-3' into arm/late
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
Makefile
diff --git
a/arch/arm/boot/dts/Makefile
b/arch/arm/boot/dts/Makefile
index 5efe585055245988b7e3c42bb39bf1441ed63421..ced698e639085ffd67e79cf700fc32a20ac64bee 100644
(file)
--- a/
arch/arm/boot/dts/Makefile
+++ b/
arch/arm/boot/dts/Makefile
@@
-336,7
+336,8
@@
dtb-$(CONFIG_MACH_MESON8) += \
dtb-$(CONFIG_ARCH_MMP) += \
pxa168-aspenite.dtb \
pxa910-dkb.dtb \
- mmp2-brownstone.dtb
+ mmp2-brownstone.dtb \
+ mmp2-olpc-xo-1-75.dtb
dtb-$(CONFIG_ARCH_MPS2) += \
mps2-an385.dtb \
mps2-an399.dtb