diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-06-20 16:08:22 (GMT) |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-06-30 11:47:52 (GMT) |
commit | b44439e42912b9dcc510a0ff891809ea2cadc46b (patch) | |
tree | dfb41063b8c8328b6991959352cab52e957a1c4a /crypto | |
parent | 929e604efa3dc0522214e0dc18984be23993e9f0 (diff) | |
download | linux-b44439e42912b9dcc510a0ff891809ea2cadc46b.tar.xz |
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>
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions