Include backported power management support under the same condition as the new one is integrated. Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- patches/11-dev-pm-ops.patch | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index f30baf8..dea121a 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 -- 1.7.1 -- 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
