diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-29 20:15:44 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-29 22:12:20 -0700 |
| commit | c668d0ee2f107b08bfae8cece288dcb088418948 (patch) | |
| tree | 35ee7c86754782ee9be662302364fdb7d23c1cba /patches | |
| parent | fbfadde3318e3e9e22c26fa61e2119c357f349af (diff) | |
backports: fix patches for next-20130709
A hunk context was off for alx.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch | 11 |
1 files changed, 6 insertions, 5 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 626f5c5a..8dae6c06 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,17 +1,18 @@ --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c -@@ -1593,6 +1593,8 @@ static const struct pci_error_handlers a - }; +@@ -1404,6 +1404,9 @@ static int alx_resume(struct device *dev + return __alx_open(alx, true); + } - #ifdef CONFIG_PM_SLEEP +compat_pci_suspend(alx_suspend); +compat_pci_resume(alx_resume); ++ static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume); #define ALX_PM_OPS (&alx_pm_ops) #else -@@ -1618,7 +1620,12 @@ static struct pci_driver alx_driver = { +@@ -1506,7 +1509,12 @@ static struct pci_driver alx_driver = { + .probe = alx_probe, .remove = alx_remove, - .shutdown = alx_shutdown, .err_handler = &alx_err_handlers, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) .driver.pm = ALX_PM_OPS, |