From: Hauke Mehrtens Date: Thu, 27 Dec 2012 17:28:20 +0000 (+0100) Subject: compat-drivers: make patches apply again X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ae9e0597f149bdaf97208c84422d9f9e23b7f55a;p=openwrt%2Fstaging%2Fblogic.git compat-drivers: make patches apply again Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch index 8255138e3c61..acae45e6f677 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)