Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

[pandora-kernel.git] / drivers / pcmcia / cardbus.c

diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index e6ab2a4..9a58862 100644 (file)
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -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;
 }