compat-drivers: make patches apply again
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 27 Dec 2012 17:28:20 +0000 (18:28 +0100)
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>
Fri, 28 Dec 2012 15:39:06 +0000 (07:39 -0800)
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
patches/collateral-evolutions/network/11-dev-pm-ops.patch

index 8255138e3c617a108dc07d0019995ef942d9c484..acae45e6f677de299ba139de1e3c9c657a5b53ec 100644 (file)
@@ -22,7 +22,7 @@ calls on compat code with only slight modifications.
 @@ -285,7 +288,12 @@ static struct pci_driver bcma_pci_bridge
        .id_table = bcma_pci_bridge_tbl,
        .probe = bcma_host_pci_probe,
-       .remove = __devexit_p(bcma_host_pci_remove),
+       .remove = bcma_host_pci_remove,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
        .driver.pm = BCMA_PM_OPS,
 +#elif defined(CONFIG_PM)