From 0b0fd5bd0e1644e2c641056c08a76c12a04f0657 Mon Sep 17 00:00:00 2001 From: Nathan Hintz Date: Fri, 4 May 2012 21:56:35 -0700 Subject: [PATCH] --- yaml --- r: 306779 b: refs/heads/master c: 16d75faed98250423abdaf1fa0a3719c5e4e8b45 h: refs/heads/master i: 306777: d9179ad5793097823a5d1c2bdbe11d850ab7427d 306775: 8d610df383a64bb9ae000adb89575eb630d536cd v: v3 --- [refs] | 2 +- trunk/drivers/bcma/host_pci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 393cbb0090db..e2a6b40f289f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c61cab3a6135eacd303a26a327c1e689ec04fcbe +refs/heads/master: 16d75faed98250423abdaf1fa0a3719c5e4e8b45 diff --git a/trunk/drivers/bcma/host_pci.c b/trunk/drivers/bcma/host_pci.c index 3a93563b4f7a..6c05cf470f96 100644 --- a/trunk/drivers/bcma/host_pci.c +++ b/trunk/drivers/bcma/host_pci.c @@ -225,7 +225,7 @@ static int __devinit bcma_host_pci_probe(struct pci_dev *dev, return err; } -static void bcma_host_pci_remove(struct pci_dev *dev) +static void __devexit bcma_host_pci_remove(struct pci_dev *dev) { struct bcma_bus *bus = pci_get_drvdata(dev); @@ -280,7 +280,7 @@ static struct pci_driver bcma_pci_bridge_driver = { .name = "bcma-pci-bridge", .id_table = bcma_pci_bridge_tbl, .probe = bcma_host_pci_probe, - .remove = bcma_host_pci_remove, + .remove = __devexit_p(bcma_host_pci_remove), .driver.pm = BCMA_PM_OPS, };