diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-02-10 14:17:10 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-02-10 14:17:10 +0100 |
| commit | 9ab99d5a43e9f283738fd9fd365539306d13eaac (patch) | |
| tree | 0214a63e3f4f7f4f187f0139e4a5d8abe453902b /drivers/pcmcia/cardbus.c | |
| parent | 76780373190d7e8ddfb6fed06aef068e2445c743 (diff) | |
| parent | b1109bf085c8dd69537b7876ea83f914dd1fe46a (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/pcmcia/cardbus.c')
| -rw-r--r-- | drivers/pcmcia/cardbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c index cdf50f3bc2df..d99f846451a3 100644 --- a/drivers/pcmcia/cardbus.c +++ b/drivers/pcmcia/cardbus.c @@ -222,7 +222,7 @@ int __ref cb_alloc(struct pcmcia_socket *s) unsigned int max, pass; s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0)); -/* pcibios_fixup_bus(bus); */ + pci_fixup_cardbus(bus); max = bus->secondary; for (pass = 0; pass < 2; pass++) |