Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit b44439e4 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Gregory CLEMENT
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: d705c1a6 ("ARM: Kirkwood: fix kirkwood_pm_init() declaration/type")
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 929e604e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment