Merge branch 'devel-pmu' into devel

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

diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index ac0686e..e6ab2a4 100644 (file)
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -71,7 +71,7 @@ int __ref cb_alloc(struct pcmcia_socket *s)
        unsigned int max, pass;
 
        s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0));
-       pci_fixup_cardbus(bus); 
+       pci_fixup_cardbus(bus);
 
        max = bus->secondary;
        for (pass = 0; pass < 2; pass++)