From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 3 Jun 2013 22:09:14 +0000 (+0100)
Subject: ARM: 7745/1: psci: fix building without HOTPLUG_CPU
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~41^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdeb94b5dc5bf9db7b3e36f3f38089a554f6a108;p=pandora-kernel.git

ARM: 7745/1: psci: fix building without HOTPLUG_CPU

The cpu_die field in smp_operations is not valid with CONFIG_HOTPLUG_CPU,
so we must enclose it in #ifdef, but at least that lets us remove
two other lines.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

Reading git-diff-tree failed