compat-drivers: refresh -u patches
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>
Fri, 14 Dec 2012 19:02:17 +0000 (11:02 -0800)
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>
Fri, 14 Dec 2012 19:02:17 +0000 (11:02 -0800)
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
patches/unified-drivers/network/0001-backport-alx.patch

index e7a0bd4aa477f530de81e0d4a11125daed34d023..0443a621a72608f13f381c8e19fa38bc4eb8aefe 100644 (file)
@@ -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,