summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/11-dev-pm-ops
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-07-29 23:32:00 -0700
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-07-30 01:40:05 -0700
commit31beeadb17fcf7d48fcbd0f9495f50002371c383 (patch)
tree6a8ff06568da778f7225ac9590667699df6cdf7e /patches/collateral-evolutions/network/11-dev-pm-ops
parenta29c78e9bc6d0e75935dae13d9bf0687d8880849 (diff)
backports: refresh patches for v3.10.4v3.10.4-1
1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.2.45 [ OK ] 20 3.3.8 [ OK ] 21 3.4.46 [ OK ] 22 3.5.7 [ OK ] 23 3.6.11 [ OK ] 24 3.7.10 [ OK ] 25 3.8.13 [ OK ] 26 3.9.3 [ OK ] real 33m18.960s user 900m1.540s sys 125m0.580s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.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_ethernet_atheros_alx_main.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch
index 4f4cce9c..1e3ce067 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
-@@ -1590,6 +1590,8 @@ static const struct pci_error_handlers a
+@@ -1589,6 +1589,8 @@ static const struct pci_error_handlers a
};
#ifdef CONFIG_PM_SLEEP
@@ -9,7 +9,7 @@
static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
#define ALX_PM_OPS (&alx_pm_ops)
#else
-@@ -1615,7 +1617,12 @@ static struct pci_driver alx_driver = {
+@@ -1614,7 +1616,12 @@ static struct pci_driver alx_driver = {
.remove = alx_remove,
.shutdown = alx_shutdown,
.err_handler = &alx_err_handlers,