summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu/Makefile
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-03-01 04:21:04 +0100
committerJason Cooper <jason@lakedaemon.net>2014-03-01 04:21:04 +0100
commit0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e (patch)
tree35e597b44cd1af328cb6b02e4f16de51ccd6f979 /arch/arm/mach-mvebu/Makefile
parentMerge branch 'mvebu/soc-3xx' into mvebu/soc (diff)
parentARM: kirkwood: Add HP T5325 thin client (diff)
downloadlinux-0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e.tar.xz
linux-0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e.zip
Merge branch 'mvebu/soc-kw' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
-rw-r--r--arch/arm/mach-mvebu/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index 2c1db29db2ca..bbeb41ee3e75 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -8,3 +8,5 @@ obj-$(CONFIG_MACH_MVEBU_V7) += board-v7.o
obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
+obj-$(CONFIG_MACH_KIRKWOOD) += kirkwood.o kirkwood-pm.o
+obj-$(CONFIG_MACH_T5325) += board-t5325.o