From: Hauke Mehrtens Date: Sat, 1 Jan 2011 14:26:18 +0000 (-0800) Subject: compat-wireless: fix power managemnet backport X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d559d1a7fd995447671716c98cbc835e5119772b;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: fix power managemnet backport Include backported power management support under the same condition as the new one is integrated. Signed-off-by: Hauke Mehrtens --- diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index f30baf86097e..dea121aa5e5c 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -60,7 +60,7 @@ calls on compat code with only slight modifications. .remove = ath_pci_remove, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) .driver.pm = ATH9K_PM_OPS, -+#elif defined(CONFIG_PM_SLEEP) ++#elif defined(CONFIG_PM) + .suspend = ath_pci_suspend_compat, + .resume = ath_pci_resume_compat, +#endif @@ -75,7 +75,7 @@ calls on compat code with only slight modifications. .remove = __devexit_p(iwl_pci_remove), +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) .driver.pm = IWL_PM_OPS, -+#elif defined(CONFIG_PM_SLEEP) ++#elif defined(CONFIG_PM) + .suspend = iwl_pci_suspend_compat, + .resume = iwl_pci_resume_compat, +#endif @@ -158,7 +158,7 @@ calls on compat code with only slight modifications. .remove = __devexit_p(iwl3945_pci_remove), +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) .driver.pm = IWL_PM_OPS, -+#elif defined(CONFIG_PM_SLEEP) ++#elif defined(CONFIG_PM) + .suspend = iwl_pci_suspend_compat, + .resume = iwl_pci_resume_compat, +#endif