Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...
[linux-2.6.git] / arch / arm / mach-ixp2000 / ixdp2800.c
index 33c6d5f..a9f1819 100644 (file)
@@ -261,14 +261,14 @@ int __init ixdp2800_pci_init(void)
                pci_common_init(&ixdp2800_pci);
                if (ixdp2x00_master_npu()) {
                        dev = pci_get_bus_and_slot(1, IXDP2800_SLAVE_ENET_DEVFN);
-                       pci_remove_bus_device(dev);
+                       pci_stop_and_remove_bus_device(dev);
                        pci_dev_put(dev);
 
                        ixdp2800_master_enable_slave();
                        ixdp2800_master_wait_for_slave_bus_scan();
                } else {
                        dev = pci_get_bus_and_slot(1, IXDP2800_MASTER_ENET_DEVFN);
-                       pci_remove_bus_device(dev);
+                       pci_stop_and_remove_bus_device(dev);
                        pci_dev_put(dev);
                }
        }