From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 6 Jun 2010 09:12:27 +0000 (+0200)
Subject: compat: use kernel pm_qos_params.h
X-Git-Tag: v2.6.37-rc1-1~46
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=63b95138cb7b75c49139acc136892f18cd7ca779;p=~emulex%2Ftmp%2Fcompat%2F.git

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 <hauke@hauke-m.de>
---

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@linux.intel.com>
@@ -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)) */