From 63b95138cb7b75c49139acc136892f18cd7ca779 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 6 Jun 2010 11:12:27 +0200 Subject: [PATCH] compat: use kernel pm_qos_params.h Do not use pm_qos_params.h from compat-wireless if the kernel also ships this file. In kernel 2.6.35 pm_qos_params.h changed and the in kernel header file is needed. Signed-off-by: Hauke Mehrtens --- include/linux/pm_qos_params.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/pm_qos_params.h b/include/linux/pm_qos_params.h index 091c13c..e1f083c 100644 --- a/include/linux/pm_qos_params.h +++ b/include/linux/pm_qos_params.h @@ -1,3 +1,8 @@ +#include + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) +#include_next +#else /* interface for the pm_qos_power infrastructure of the linux kernel. * * Mark Gross @@ -23,4 +28,5 @@ int pm_qos_requirement(int qos); int pm_qos_add_notifier(int qos, struct notifier_block *notifier); int pm_qos_remove_notifier(int qos, struct notifier_block *notifier); +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) */ -- 2.41.0