diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-05-20 00:20:51 +0200 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-19 17:36:08 -0700 |
| commit | 7c49064a85c8a3a06e66e77f82aae1548dda960c (patch) | |
| tree | c9092948426115ce7fdbd694b01fcf0b99f95efe /patches/collateral-evolutions/network/11-dev-pm-ops | |
| parent | 8badd50471ff1dd1388d96514d719b0ad15cc695 (diff) | |
backport: refresh patches on next-20130513
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/11-dev-pm-ops')
2 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_4965-mac.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_4965-mac.patch index 79805b02..ff98dd5f 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_4965-mac.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_4965-mac.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c -@@ -6801,7 +6801,12 @@ static struct pci_driver il4965_driver = +@@ -6800,7 +6800,12 @@ static struct pci_driver il4965_driver = .id_table = il4965_hw_card_ids, .probe = il4965_pci_probe, .remove = il4965_pci_remove, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch index 900e355b..6ab15661 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -348,6 +348,9 @@ static int iwl_pci_resume(struct device +@@ -349,6 +349,9 @@ static int iwl_pci_resume(struct device return iwl_trans_resume(iwl_trans); } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); #define IWL_PM_OPS (&iwl_dev_pm_ops) -@@ -363,7 +366,12 @@ static struct pci_driver iwl_pci_driver +@@ -364,7 +367,12 @@ static struct pci_driver iwl_pci_driver .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = iwl_pci_remove, |