diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-27 15:38:35 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-29 22:12:20 -0700 |
| commit | fbfadde3318e3e9e22c26fa61e2119c357f349af (patch) | |
| tree | 56c562a41cb386ff2564a8406203d5c15a5c7036 /patches/collateral-evolutions/network/11-dev-pm-ops | |
| parent | 0cbba25bdf70ec3d7f2a27e36db295f535dcd230 (diff) | |
backports: refresh patches for next-20130703
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.10-rc1 [ OK ]
20 3.2.45 [ OK ]
21 3.3.8 [ OK ]
22 3.4.46 [ OK ]
23 3.5.7 [ OK ]
24 3.6.11 [ OK ]
25 3.7.10 [ OK ]
26 3.8.13 [ OK ]
27 3.9.3 [ OK ]
real 32m59.877s
user 880m31.524s
sys 124m11.996s
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_bcma_host_pci.patch | 2 | ||||
| -rw-r--r-- | patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch index 1b9b5788..00790a66 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend, bcma_host_pci_resume); #define BCMA_PM_OPS (&bcma_pm_ops) -@@ -285,7 +288,12 @@ static struct pci_driver bcma_pci_bridge +@@ -286,7 +289,12 @@ static struct pci_driver bcma_pci_bridge .id_table = bcma_pci_bridge_tbl, .probe = bcma_host_pci_probe, .remove = bcma_host_pci_remove, 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..626f5c5a 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 +@@ -1593,6 +1593,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 = { +@@ -1618,7 +1620,12 @@ static struct pci_driver alx_driver = { .remove = alx_remove, .shutdown = alx_shutdown, .err_handler = &alx_err_handlers, |