From: Andrew Morton <akpm@linux-foundation.org>

drivers/cpuidle/cpuidle.c:15:27: error: linux/latency.h: No such file or directory
drivers/cpuidle/cpuidle.c: In function 'cpuidle_init':
drivers/cpuidle/cpuidle.c:290: error: implicit declaration of function 'register_latency_notifier'

Cc: mark gross <mgross@linux.intel.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Adam Belay <abelay@novell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/cpuidle/cpuidle.c     |    7 +++++--
 include/linux/pm_qos_params.h |    3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff -puN drivers/cpuidle/cpuidle.c~pm-qos-infrastructure-and-interface-vs-git-acpi drivers/cpuidle/cpuidle.c
--- a/drivers/cpuidle/cpuidle.c~pm-qos-infrastructure-and-interface-vs-git-acpi
+++ a/drivers/cpuidle/cpuidle.c
@@ -12,7 +12,7 @@
 #include <linux/mutex.h>
 #include <linux/sched.h>
 #include <linux/notifier.h>
-#include <linux/latency.h>
+#include <linux/pm_qos_params.h>
 #include <linux/cpu.h>
 #include <linux/cpuidle.h>
 
@@ -266,7 +266,10 @@ static struct notifier_block cpuidle_lat
 	.notifier_call = cpuidle_latency_notify,
 };
 
-#define latency_notifier_init(x) do { register_latency_notifier(x); } while (0)
+static inline void latency_notifier_init(struct notifier_block *n)
+{
+        pm_qos_add_notifier(PM_QOS_CPUIDLE, n);
+}
 
 #else /* CONFIG_SMP */
 
diff -puN include/linux/pm_qos_params.h~pm-qos-infrastructure-and-interface-vs-git-acpi include/linux/pm_qos_params.h
--- a/include/linux/pm_qos_params.h~pm-qos-infrastructure-and-interface-vs-git-acpi
+++ a/include/linux/pm_qos_params.h
@@ -20,8 +20,9 @@ struct requirement_list {
 #define PM_QOS_CPU_DMA_LATENCY 1
 #define PM_QOS_NETWORK_LATENCY 2
 #define PM_QOS_NETWORK_THROUGHPUT 3
+#define PM_QOS_CPUIDLE 4
 
-#define PM_QOS_NUM_CLASSES 4
+#define PM_QOS_NUM_CLASSES 5
 #define PM_QOS_DEFAULT_VALUE -1
 
 int pm_qos_add_requirement(int qos, char *name, s32 value);
_