compat-wireless: fix power managemnet backport
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 1 Jan 2011 14:26:18 +0000 (06:26 -0800)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Wed, 5 Jan 2011 23:21:13 +0000 (15:21 -0800)
Include backported power management support under the same condition as
the new one is integrated.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
patches/11-dev-pm-ops.patch

index f30baf86097e1da4b1ef82e7e45aa1fa2da72dab..dea121aa5e5c112d0d57743e46df224f4aec7bf1 100644 (file)
@@ -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