From b76dfde2f4a311e7e0d7ef44324cb8ccdbc2c513 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 23 Aug 2011 13:36:06 +0200 Subject: [PATCH] compat-wireless: pm_qos_request_list was renamed to pm_qos_request In the following commit in linux-next pm_qos_request_list was renamed to pm_qos_request: commit b10ac0c24e4c618a99262ad47a1b0176f152883d Author: Jean Pihet Date: Thu Aug 18 10:32:02 2011 +0200 PM QoS: Minor clean-ups Backporting it with a #define in compat did not worked as there is also a function called pm_qos_request() and its name did not changed. Signed-off-by: Hauke Mehrtens --- patches/43-rename_pm_qos_request.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 patches/43-rename_pm_qos_request.patch diff --git a/patches/43-rename_pm_qos_request.patch b/patches/43-rename_pm_qos_request.patch new file mode 100644 index 000000000000..fce4337634d5 --- /dev/null +++ b/patches/43-rename_pm_qos_request.patch @@ -0,0 +1,14 @@ +--- a/drivers/net/wireless/ipw2x00/ipw2100.c ++++ b/drivers/net/wireless/ipw2x00/ipw2100.c +@@ -174,7 +174,11 @@ that only one external action is invoked + #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver" + #define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)) ++static struct pm_qos_request_list ipw2100_pm_qos_req; ++#else + static struct pm_qos_request ipw2100_pm_qos_req; ++#endif + + /* Debugging stuff */ + #ifdef CONFIG_IPW2100_DEBUG -- 2.30.2