summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-12-27 18:28:20 +0100
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2012-12-28 07:39:06 -0800
commitae9e0597f149bdaf97208c84422d9f9e23b7f55a (patch)
tree57e34c626565118d6dab2a25329c660cf3c97a3b /patches
parent4b974aa687a04b9c9742ecc5b2d339d0bd0dcd4f (diff)
compat-drivers: make patches apply again
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/collateral-evolutions/network/11-dev-pm-ops.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
index 8255138e..acae45e6 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
@@ -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)