diff options
author | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:21:04 +0000 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:21:04 +0000 |
commit | 0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e (patch) | |
tree | 35e597b44cd1af328cb6b02e4f16de51ccd6f979 /arch/arm/mach-mvebu/Makefile | |
parent | aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf (diff) | |
parent | b02b64384696ad13d6a827dc7775489d01b3dfd9 (diff) | |
download | op-kernel-dev-0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e.zip op-kernel-dev-0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e.tar.gz |
Merge branch 'mvebu/soc-kw' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
-rw-r--r-- | arch/arm/mach-mvebu/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 2c1db29..bbeb41e 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 |