compat-wirless: deactivate PM support for libertas_spi for kernel < 2.6.29
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 31 Mar 2011 16:22:05 +0000 (09:22 -0700)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Thu, 31 Mar 2011 19:18:42 +0000 (12:18 -0700)
The power management interface changed in kernel 2.6.29 and this breaks
build on older kernels.

CC: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
patches/11-dev-pm-ops.patch

index 2922f7a3d892b8fecac2dd27b629c3ff5e65fa73..25759f5eba8ffc5ed6df937b63556336b1c8a628 100644 (file)
@@ -117,6 +117,34 @@ calls on compat code with only slight modifications.
  };
  
  int ath_pci_init(void)
+--- a/drivers/net/wireless/libertas/if_spi.c
++++ b/drivers/net/wireless/libertas/if_spi.c
+@@ -1204,6 +1204,7 @@ static int __devexit libertas_spi_remove
+       return 0;
+ }
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
+ static int if_spi_suspend(struct device *dev)
+ {
+       struct spi_device *spi = to_spi_device(dev);
+@@ -1237,6 +1238,7 @@ static const struct dev_pm_ops if_spi_pm
+       .suspend        = if_spi_suspend,
+       .resume         = if_spi_resume,
+ };
++#endif
+ static struct spi_driver libertas_spi_driver = {
+       .probe  = if_spi_probe,
+@@ -1245,7 +1247,9 @@ static struct spi_driver libertas_spi_dr
+               .name   = "libertas_spi",
+               .bus    = &spi_bus_type,
+               .owner  = THIS_MODULE,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
+               .pm     = &if_spi_pm_ops,
++#endif
+       },
+ };
 --- a/drivers/net/wireless/iwlegacy/iwl-core.c
 +++ b/drivers/net/wireless/iwlegacy/iwl-core.c
 @@ -2048,15 +2048,17 @@ int iwl_legacy_pci_resume(struct device