OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-soc' into test-merge
[uclinux-h8/linux.git]
/
arch
/
arm
/
boot
/
dts
/
Makefile
diff --git
a/arch/arm/boot/dts/Makefile
b/arch/arm/boot/dts/Makefile
index
4814c6b
..
c52002c
100644
(file)
--- a/
arch/arm/boot/dts/Makefile
+++ b/
arch/arm/boot/dts/Makefile
@@
-223,7
+223,7
@@
dtb-$(CONFIG_SOC_IMX25) += \
imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \
imx25-karo-tx25.dtb \
imx25-pdk.dtb
-dtb-$(CONFIG_SOC_IMX
31
) += \
+dtb-$(CONFIG_SOC_IMX
27
) += \
imx27-apf27.dtb \
imx27-apf27dev.dtb \
imx27-eukrea-mbimxsd27-baseboard.dtb \