summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/11-dev-pm-ops
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-04-05 18:14:56 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-04-05 18:14:56 +0200
commitd6ed4a46fec0fa02235f6a4e6ea2c27546c5f86d (patch)
treec67d9f287dc442bd753cff34a847077fca8b66f1 /patches/collateral-evolutions/network/11-dev-pm-ops
parente0b10245025f5661e03fdedb0c7053a616359158 (diff)
rediff patches against next-20130404
With the previous two patches, next-20130404 passes ckmake --allyesconfig. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/11-dev-pm-ops')
-rw-r--r--patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch4
-rw-r--r--patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch
index e297248b..6de2fe71 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
-@@ -372,6 +372,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
+@@ -374,6 +374,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
@@ -10,7 +10,7 @@
static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
static struct pci_driver rtl92ce_driver = {
-@@ -379,7 +382,12 @@ static struct pci_driver rtl92ce_driver
+@@ -381,7 +384,12 @@ static struct pci_driver rtl92ce_driver
.id_table = rtl92ce_pci_ids,
.probe = rtl_pci_probe,
.remove = rtl_pci_disconnect,
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch
index 52225549..9e08679e 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
-@@ -429,6 +429,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
+@@ -430,6 +430,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
@@ -10,7 +10,7 @@
static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
static struct pci_driver rtl92se_driver = {
-@@ -436,7 +439,12 @@ static struct pci_driver rtl92se_driver
+@@ -437,7 +440,12 @@ static struct pci_driver rtl92se_driver
.id_table = rtl92se_pci_ids,
.probe = rtl_pci_probe,
.remove = rtl_pci_disconnect,