Skip to content

Commit

Permalink
compat-drivers: make patches apply again
Browse files Browse the repository at this point in the history
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
  • Loading branch information
hauke authored and mcgrof committed Dec 28, 2012
1 parent 4b974aa commit ae9e059
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion patches/collateral-evolutions/network/11-dev-pm-ops.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ae9e059

Please sign in to comment.