diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-05 16:56:33 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-05 16:56:33 +0300 |
| commit | 86545b94376f445a3646227f0d433bec5e00499b (patch) | |
| tree | 30ed8e718439f6009c6923a776026ec39b0a71f1 /arch/arm | |
| parent | 600da64b771af45e40018500cd510b0c570130aa (diff) | |
| parent | b44439e42912b9dcc510a0ff891809ea2cadc46b (diff) | |
| download | linux-86545b94376f445a3646227f0d433bec5e00499b.tar.xz | |
Merge tag 'mvebu-fixes-4.7-2' of git://git.infradead.org/linux-mvebu into fixes
Pull "mvebu fixes for 4.7 (part 2)" from Gregory CLEMENT:
Fix a regression introduced by a cleanup on kirkwood_pm_init
* tag 'mvebu-fixes-4.7-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: compile pm code conditionally
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index ecf9e0c3b107..e53c6cfcab51 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -7,9 +7,15 @@ CFLAGS_pmsu.o := -march=armv7-a obj-$(CONFIG_MACH_MVEBU_ANY) += 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 pmsu_ll.o pm.o pm-board.o +obj-y += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o + +obj-$(CONFIG_PM) += pm.o pm-board.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o endif obj-$(CONFIG_MACH_DOVE) += dove.o -obj-$(CONFIG_MACH_KIRKWOOD) += kirkwood.o kirkwood-pm.o + +ifeq ($(CONFIG_MACH_KIRKWOOD),y) +obj-y += kirkwood.o +obj-$(CONFIG_PM) += kirkwood-pm.o +endif |