diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 12:35:10 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 12:35:10 (GMT) |
| commit | 10e167329b029890a4c704f094822da5f259b886 (patch) | |
| tree | c0950b7cb928ee26b07c39348e4539602ce3aec9 /arch/arm/imx-common/Makefile | |
| parent | dbc000bfb51eb30d786521e6b8e29048c36cbefa (diff) | |
| parent | 4a1c7b13ae104d4526d3176793b7f6b06694df15 (diff) | |
| download | u-boot-10e167329b029890a4c704f094822da5f259b886.tar.xz | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/Makefile
Diffstat (limited to 'arch/arm/imx-common/Makefile')
| -rw-r--r-- | arch/arm/imx-common/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 8bba8a5..9492326 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)libimx-common.o -ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6)) +ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 vf610)) COBJS-y = iomux-v3.o endif ifeq ($(SOC),$(filter $(SOC),mx5 mx6)) |