backports: fix atl1.c dev-pm-ops patch

As of next-20130419 the atl1.c driver uses
atl1_pm_ops directly instead of the ATL1_PM_OPS
macro. This fixes that hunk.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch
index 1e3cb6d67e681d8a63e9ebee0987b8dcc446d056..7fd2a4d44240abad0660bbf8c4286fa0740326b9 100644 (file)
--- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch
@@ -1,21 +1,21 @@
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -2877,6 +2877,9 @@ static int atl1_resume(struct device *de
-       return 0;
+@@ -2878,6 +2878,9 @@ static int atl1_resume(struct device *de
  }
+ #endif
  
 +compat_pci_suspend(atl1_suspend)
 +compat_pci_resume(atl1_resume)
 +
  static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume);
- #define ATL1_PM_OPS   (&atl1_pm_ops)
  
-@@ -3147,7 +3150,12 @@ static struct pci_driver atl1_driver = {
+ static void atl1_shutdown(struct pci_dev *pdev)
+@@ -3142,7 +3145,12 @@ static struct pci_driver atl1_driver = {
        .probe = atl1_probe,
        .remove = atl1_remove,
        .shutdown = atl1_shutdown,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
-       .driver.pm = ATL1_PM_OPS,
+       .driver.pm = &atl1_pm_ops,
 +#elif defined(CONFIG_PM_SLEEP)
 +      .suspend        = atl1_suspend_compat,
 +      .resume         = atl1_resume_compat,