ARM: mvebu: compile pm code conditionally
authorArnd Bergmann <arnd@arndb.de>
Mon, 20 Jun 2016 16:08:22 +0000 (18:08 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Thu, 30 Jun 2016 11:47:52 +0000 (13:47 +0200)
commitb44439e42912b9dcc510a0ff891809ea2cadc46b
treedfb41063b8c8328b6991959352cab52e957a1c4a
parent929e604efa3dc0522214e0dc18984be23993e9f0
ARM: mvebu: compile pm code conditionally

A cleanup to include the headers correctly caused another build problem:

arch/arm/mach-mvebu/kirkwood-pm.c:70:13: error: redefinition of 'kirkwood_pm_init'
arch/arm/mach-mvebu/kirkwood-pm.h:23:20: note: previous definition of 'kirkwood_pm_init' was here

The underlying issue is that kirkwood-pm.o is not actually meant to be
used when CONFIG_PM is disabled, so we should also leave it out of the
Makefile.

The same seems to be true for the PM code in MACH_MVEBU_V7, and I'm
treating it the same way here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: d705c1a66e15 ("ARM: Kirkwood: fix kirkwood_pm_init() declaration/type")
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
arch/arm/mach-mvebu/Makefile