aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/apc.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2013-02-09 23:27:26 -0500
committerLen Brown <len.brown@intel.com>2013-02-17 23:36:56 -0500
commitd472ba840d622e48f5c94369263ef3af18ab64f8 (patch)
treeed4984bb9f6d39a10a351ae8f07f4f7a795d9623 /arch/sparc/kernel/apc.c
parent3738fa5bbc3acaf6a807cb45f4367cbab412faee (diff)
sparc idle: rename pm_idle to sparc_idle
(pm_idle)() is being removed from linux/pm.h because Linux does not have such a cross-architecture concept. sparc uses an idle function pointer in its architecture specific code. So we re-name sparc use of pm_idle to sparc_idle. Signed-off-by: Len Brown <len.brown@intel.com> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/sparc/kernel/apc.c')
-rw-r--r--arch/sparc/kernel/apc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c
index 348fa1aeabce..eefda32b595e 100644
--- a/arch/sparc/kernel/apc.c
+++ b/arch/sparc/kernel/apc.c
@@ -20,6 +20,7 @@
20#include <asm/uaccess.h> 20#include <asm/uaccess.h>
21#include <asm/auxio.h> 21#include <asm/auxio.h>
22#include <asm/apc.h> 22#include <asm/apc.h>
23#include <asm/processor.h>
23 24
24/* Debugging 25/* Debugging
25 * 26 *
@@ -158,7 +159,7 @@ static int apc_probe(struct platform_device *op)
158 159
159 /* Assign power management IDLE handler */ 160 /* Assign power management IDLE handler */
160 if (!apc_no_idle) 161 if (!apc_no_idle)
161 pm_idle = apc_swift_idle; 162 sparc_idle = apc_swift_idle;
162 163
163 printk(KERN_INFO "%s: power management initialized%s\n", 164 printk(KERN_INFO "%s: power management initialized%s\n",
164 APC_DEVNAME, apc_no_idle ? " (CPU idle disabled)" : ""); 165 APC_DEVNAME, apc_no_idle ? " (CPU idle disabled)" : "");