summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@frijolero.org>2012-03-31 21:08:22 -0700
committerLuis R. Rodriguez <mcgrof@frijolero.org>2012-03-31 21:08:22 -0700
commit9656f874ac7a6498c860b4ffcbf643dca00f85b3 (patch)
treedf5138d67d46d983972066be2f92acfc8dfef530 /patches
parent3d2ccfdae8e51f76946adaa5229fb1d13f9dd074 (diff)
compat-wireless: fix p54 pm ops backport typo again
Really.. Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
Diffstat (limited to 'patches')
-rw-r--r--patches/11-dev-pm-ops.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 69647260..c550066d 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -381,10 +381,10 @@ calls on compat code with only slight modifications.
- .poweroff = p54p_suspend,
- .restore = p54p_resume,
-};
-+compat_pci_suspend(p54_suspend)
-+compat_pci_resume(p54_resume)
++compat_pci_suspend(p54p_suspend)
++compat_pci_resume(p54p_resume)
+
-+static SIMPLE_DEV_PM_OPS(p54_pm_ops, p54_suspend, p54_resume);
++static SIMPLE_DEV_PM_OPS(p54pci_pm_ops, p54p_suspend, p54p_resume);
#define P54P_PM_OPS (&p54pci_pm_ops)
#else
@@ -395,8 +395,8 @@ calls on compat code with only slight modifications.
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
.driver.pm = P54P_PM_OPS,
+#elif defined(CONFIG_PM)
-+ .suspend = p54_suspend_compat,
-+ .resume = p54_resume_compat,
++ .suspend = p54p_suspend_compat,
++ .resume = p54p_resume_compat,
+#endif
};