Revert "ARM: tegra: tegratab: dummy change"
[linux-2.6.git] / drivers / pcmcia / cardbus.c
index e6ab2a4..6e75153 100644 (file)
@@ -94,7 +94,6 @@ int __ref cb_alloc(struct pcmcia_socket *s)
        pci_enable_bridges(bus);
        pci_bus_add_devices(bus);
 
-       s->irq.AssignedIRQ = s->pci_irq;
        return 0;
 }
 
@@ -109,5 +108,5 @@ void cb_free(struct pcmcia_socket *s)
        struct pci_dev *bridge = s->cb_dev;
 
        if (bridge)
-               pci_remove_behind_bridge(bridge);
+               pci_stop_and_remove_behind_bridge(bridge);
 }