|
@@ -26,7 +26,6 @@
|
|
|
#include <linux/of_fdt.h>
|
|
|
#include <linux/interrupt.h>
|
|
|
#include <linux/bug.h>
|
|
|
-#include <linux/cpuidle.h>
|
|
|
#include <linux/pci.h>
|
|
|
|
|
|
#include <asm/machdep.h>
|
|
@@ -225,16 +224,6 @@ static int __init pnv_probe(void)
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-void powernv_idle(void)
|
|
|
-{
|
|
|
- /* Hook to cpuidle framework if available, else
|
|
|
- * call on default platform idle code
|
|
|
- */
|
|
|
- if (cpuidle_idle_call()) {
|
|
|
- power7_idle();
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
define_machine(powernv) {
|
|
|
.name = "PowerNV",
|
|
|
.probe = pnv_probe,
|
|
@@ -244,7 +233,7 @@ define_machine(powernv) {
|
|
|
.show_cpuinfo = pnv_show_cpuinfo,
|
|
|
.progress = pnv_progress,
|
|
|
.machine_shutdown = pnv_shutdown,
|
|
|
- .power_save = powernv_idle,
|
|
|
+ .power_save = power7_idle,
|
|
|
.calibrate_decr = generic_calibrate_decr,
|
|
|
.dma_set_mask = pnv_dma_set_mask,
|
|
|
#ifdef CONFIG_KEXEC
|