diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:20:55 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:20:55 +0000 |
| commit | aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf (patch) | |
| tree | 860b1de328ad7bc65fd430ea09368394f024a7e0 /arch/arm/mach-mvebu/Makefile | |
| parent | b92f10be479b3b63e753968a0c6cb3f605ad7142 (diff) | |
| parent | 665ca874e1f7f0690a1efa6900e71490c3814fcd (diff) | |
| download | talos-obmc-linux-aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf.tar.gz talos-obmc-linux-aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf.zip | |
Merge branch 'mvebu/soc-3xx' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index d99846103bbb..2c1db29db2ca 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -3,7 +3,8 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ AFLAGS_coherency_ll.o := -Wa,-march=armv7-a -obj-y += coherency.o coherency_ll.o pmsu.o system-controller.o mvebu-soc-id.o -obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o +obj-y += system-controller.o mvebu-soc-id.o +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 |
