diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2012-12-14 11:02:17 -0800 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2012-12-14 11:02:17 -0800 |
commit | d5bcadc081d89b3944756361ae90a4bca8fc63af (patch) | |
tree | 8ba0dad36c9fbe4bdd3bc79a73f8a656002c2157 | |
parent | 38fff141859fe1fa341114fb51d775e4136b287e (diff) | |
download | compat-drivers-old-d5bcadc081d89b3944756361ae90a4bca8fc63af.tar.gz |
compat-drivers: refresh -u patches
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r-- | patches/unified-drivers/network/0001-backport-alx.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/unified-drivers/network/0001-backport-alx.patch b/patches/unified-drivers/network/0001-backport-alx.patch index e7a0bd4a..0443a621 100644 --- a/patches/unified-drivers/network/0001-backport-alx.patch +++ b/patches/unified-drivers/network/0001-backport-alx.patch @@ -101,15 +101,15 @@ This should go into patches/01-netdev.patch /* read permanent mac addr from register or eFuse */ if (alx_get_perm_macaddr(adpt, adpt->perm_addr)) { -@@ -2785,6 +2814,8 @@ static struct pci_error_handlers alx_err +@@ -2783,6 +2812,8 @@ static struct pci_error_handlers alx_err + }; + #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 - #define ALX_PM_OPS NULL - #endif @@ -2796,7 +2827,12 @@ static struct pci_driver alx_driver = { .remove = __devexit_p(alx_remove), .shutdown = alx_shutdown, |