diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 15:41:36 +0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 15:41:36 +0400 |
| commit | 5abe65e3d67aac9f9b5c08660f817a2d6ec5515f (patch) | |
| tree | 7422d99151ab4967a4b0f1783a156e6a1527ccde /arch/arm/mach-mvebu/Makefile | |
| parent | ba364fc752daeded072a5ef31e43b84cb1f9e5fd (diff) | |
| parent | a728b977429383b3fe92b6e3bff9e69365609e0f (diff) | |
| download | linux-5abe65e3d67aac9f9b5c08660f817a2d6ec5515f.tar.xz | |
Merge branch 'mvebu/fixes' into mvebu/soc-cpuidle
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 90bcd5327312..bc7689e530a4 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -7,7 +7,7 @@ CFLAGS_pmsu.o := -march=armv7-a obj-y += system-controller.o mvebu-soc-id.o ifeq ($(CONFIG_MACH_MVEBU_V7),y) -obj-y += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o +obj-y += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o endif |