diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:36 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:36 +0200 |
| commit | 6e30646fa28908b3f199d070ebb85151fef52a10 (patch) | |
| tree | ad26005307ee7fe7674feeb68cb452091e7188c7 /arch/arm/boards/Makefile | |
| parent | 904298deb07d532a76de153a42c6f678d2e4c740 (diff) | |
| parent | f93b5f8eb973a62affbaf134f07d367649ed3ae4 (diff) | |
| download | barebox-6e30646fa28908b3f199d070ebb85151fef52a10.tar.gz barebox-6e30646fa28908b3f199d070ebb85151fef52a10.tar.xz | |
Merge branch 'for-next/tegra'
Conflicts:
arch/arm/dts/Makefile
images/Makefile
Diffstat (limited to 'arch/arm/boards/Makefile')
| -rw-r--r-- | arch/arm/boards/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 2210fd4550..c273f0cb1e 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -80,6 +80,7 @@ obj-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += terasic-sockit/ 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_TOSHIBA_AC100) += toshiba-ac100/ obj-$(CONFIG_MACH_TQMA53) += tqma53/ obj-$(CONFIG_MACH_TQMA6X) += tqma6x/ |