diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:56 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:56 +0100 |
| commit | e0f22f8d43ea9aa1094b10ad217fbb8d538a3554 (patch) | |
| tree | f8f3df9243973fe14934755d5237f14e85a7b2b1 /arch/arm/boards/Makefile | |
| parent | 3d551bce2b90268c7285d55aaaf43a8240ff18d4 (diff) | |
| parent | df1d5326a995e65f3c1fe86f66a04d18f68244cf (diff) | |
| download | barebox-e0f22f8d43ea9aa1094b10ad217fbb8d538a3554.tar.gz barebox-e0f22f8d43ea9aa1094b10ad217fbb8d538a3554.tar.xz | |
Merge branch 'for-next/tegra'
Diffstat (limited to 'arch/arm/boards/Makefile')
| -rw-r--r-- | arch/arm/boards/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 8ee1bb7a05..0d8c9cf4cf 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -85,7 +85,7 @@ obj-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += solidrun-hummingboard/ obj-$(CONFIG_MACH_TNY_A9260) += tny-a926x/ obj-$(CONFIG_MACH_TNY_A9263) += tny-a926x/ obj-$(CONFIG_MACH_TNY_A9G20) += tny-a926x/ -obj-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += toradex-colibri-t20-iris/ +obj-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += toradex-colibri-t20/ obj-$(CONFIG_MACH_TOSHIBA_AC100) += toshiba-ac100/ obj-$(CONFIG_MACH_TQMA53) += tqma53/ obj-$(CONFIG_MACH_TQMA6X) += tqma6x/ |