diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 00:34:01 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 00:34:01 +0000 |
| commit | d181e69c91718a3c7b727596cb06ce0fb39b41d1 (patch) | |
| tree | db6c3002547bfb5af81fe6a143c10fc492b860ff /arch/arm/mach-mvebu/Makefile | |
| parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) | |
| parent | 08bb3adfd3adeb4653095e7968b6a46cef940404 (diff) | |
Merge tag 'tags/mvebu-soc-3.15' into mvebu/soc-3xx
mvebu soc changes for v3.15
- mvebu
- Makefile cleanup and remove map_io
- use of_find_matching_node_and_match
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 878aebe98dcc..d99846103bbb 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -3,8 +3,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ AFLAGS_coherency_ll.o := -Wa,-march=armv7-a -obj-y += system-controller.o mvebu-soc-id.o +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-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |