diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:49:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:49:55 +0200 |
| commit | 07afe7d0e00a9e14c5918a887161e6ccce542165 (patch) | |
| tree | d1327c21b23f30d9e4fbb90f01e472e05e8a0f5f /arch/arm/boards/Makefile | |
| parent | b1aae799f93634bc724c49268972457e0361a633 (diff) | |
| parent | 6f6e1377e4b1c71fa4a7a7290dcc79a7301cc4f9 (diff) | |
| download | barebox-07afe7d0e00a9e14c5918a887161e6ccce542165.tar.gz barebox-07afe7d0e00a9e14c5918a887161e6ccce542165.tar.xz | |
Merge branch 'for-next/marvell'
Conflicts:
arch/arm/boards/Makefile
arch/arm/dts/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 4267307fc8..2e924fd787 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -91,6 +91,7 @@ obj-$(CONFIG_MACH_TX53) += karo-tx53/ obj-$(CONFIG_MACH_USB_A9260) += usb-a926x/ obj-$(CONFIG_MACH_USB_A9263) += usb-a926x/ obj-$(CONFIG_MACH_USB_A9G20) += usb-a926x/ +obj-$(CONFIG_MACH_USI_TOPKICK) += usi-topkick/ obj-$(CONFIG_MACH_VERSATILEPB) += versatile/ obj-$(CONFIG_MACH_VEXPRESS) += vexpress/ obj-$(CONFIG_MACH_ZEDBOARD) += avnet-zedboard/ |