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 <hauke@xxxxxxxxxx> --- include/linux/pm_qos_params.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) 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 <linux/version.h> + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) +#include_next <linux/pm_qos_params.h> +#else /* interface for the pm_qos_power infrastructure of the linux kernel. * * Mark Gross <mgross@xxxxxxxxxxxxxxx> @@ -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)) */ -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
