diff mbox

[1/3] compat-wireless: make patches apply again

Message ID 1309286332-12470-1-git-send-email-hauke@hauke-m.de (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Hauke Mehrtens June 28, 2011, 6:38 p.m. UTC 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/11-dev-pm-ops.patch |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

Comments

Luis Rodriguez June 28, 2011, 6:43 p.m. UTC | #1 
On Tue, Jun 28, 2011 at 11:38 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Sorry I just pushed this change out, will check the others, seems we
both tackled it at the same time.

  Luis
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index b36c48b..c64a6e2 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -219,26 +219,17 @@  calls on compat code with only slight modifications.
  static int __init iwl4965_init(void)
 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
-@@ -530,14 +530,10 @@ static int iwl_pci_resume(struct device
- 	return iwl_resume(priv);
- }
+@@ -527,6 +527,9 @@ static int iwl_pci_resume(struct device
+ 
+ static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
  
--static const struct dev_pm_ops iwl_dev_pm_ops = {
--	.suspend = iwl_pci_suspend,
--	.resume = iwl_pci_resume,
--	.freeze = iwl_pci_suspend,
--	.thaw = iwl_pci_resume,
--	.poweroff = iwl_pci_suspend,
--	.restore = iwl_pci_resume,
--};
-+const SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
-+
 +compat_pci_suspend(iwl_pci_suspend)
 +compat_pci_resume(iwl_pci_resume)
- 
++
  #define IWL_PM_OPS	(&iwl_dev_pm_ops)
  
-@@ -552,7 +548,12 @@ static struct pci_driver iwl_pci_driver
+ #else
+@@ -540,7 +543,12 @@ static struct pci_driver iwl_pci_driver
  	.id_table = iwl_hw_card_ids,
  	.probe = iwl_pci_probe,
  	.remove = __devexit_p(iwl_pci_remove),