diff options
| author | Len Brown <len.brown@intel.com> | 2013-02-09 23:27:26 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2013-02-17 23:36:56 -0500 |
| commit | d472ba840d622e48f5c94369263ef3af18ab64f8 (patch) | |
| tree | ed4984bb9f6d39a10a351ae8f07f4f7a795d9623 /arch/sparc/kernel/pmc.c | |
| parent | 3738fa5bbc3acaf6a807cb45f4367cbab412faee (diff) | |
| download | linux-d472ba840d622e48f5c94369263ef3af18ab64f8.tar.bz2 | |
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/pmc.c')
| -rw-r--r-- | arch/sparc/kernel/pmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c index dcbb62f63068..8b7297faca79 100644 --- a/arch/sparc/kernel/pmc.c +++ b/arch/sparc/kernel/pmc.c @@ -17,6 +17,7 @@ #include <asm/oplib.h> #include <asm/uaccess.h> #include <asm/auxio.h> +#include <asm/processor.h> /* Debug * @@ -63,7 +64,7 @@ static int pmc_probe(struct platform_device *op) #ifndef PMC_NO_IDLE /* Assign power management IDLE handler */ - pm_idle = pmc_swift_idle; + sparc_idle = pmc_swift_idle; #endif printk(KERN_INFO "%s: power management initialized\n", PMC_DEVNAME); |