Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...
[linux-2.6.git] / arch / arm / mach-ixp2000 / ixdp2x00.c
index 910426a..421e38d 100644 (file)
@@ -238,12 +238,12 @@ void ixdp2x00_slave_pci_postinit(void)
         * Remove PMC device is there is one
         */
        if((dev = pci_get_bus_and_slot(1, IXDP2X00_PMC_DEVFN))) {
-               pci_remove_bus_device(dev);
+               pci_stop_and_remove_bus_device(dev);
                pci_dev_put(dev);
        }
 
        dev = pci_get_bus_and_slot(0, IXDP2X00_21555_DEVFN);
-       pci_remove_bus_device(dev);
+       pci_stop_and_remove_bus_device(dev);
        pci_dev_put(dev);
 }