Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux-next

2014-05-28 19:00:14 +02:00
parent 5ec79bf919 322014531e
commit 2e2d663d2d
41 changed files with 2257 additions and 218 deletions
--- a/arch/mips/kernel/idle.c
+++ b/arch/mips/kernel/idle.c
@@ -236,3 +236,14 @@ void arch_cpu_idle(void)
 	else
 		local_irq_enable();
 }
+
+#ifdef CONFIG_CPU_IDLE
+
+int mips_cpuidle_wait_enter(struct cpuidle_device *dev,
+			    struct cpuidle_driver *drv, int index)
+{
+	arch_cpu_idle();
+	return index;
+}
+
+#endif