diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 16:13:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 16:13:24 -0500 |
| commit | d661d76b0262f3ed649a1dea24c0119757592b09 (patch) | |
| tree | ff56854943219c16f51e18c5360b9626c3a20474 /drivers/pcmcia | |
| parent | b07d41b77e58baa2df2326cec68dde03cb2348c5 (diff) | |
| parent | 2d1c861871d767153538a77c498752b36d4bb4b8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI/cardbus: Add a fixup hook and fix powerpc
PCI: change PCI nomenclature in drivers/pci/ (non-comment changes)
PCI: change PCI nomenclature in drivers/pci/ (comment changes)
PCI: fix section mismatch on update_res()
PCI: add Intel 82599 Virtual Function specific reset method
PCI: add Intel USB specific reset method
PCI: support device-specific reset methods
PCI: Handle case when no pci device can provide cache line size hint
PCI/PM: Propagate wake-up enable for PCIe devices too
vgaarbiter: fix a typo in the vgaarbiter Documentation
Diffstat (limited to 'drivers/pcmcia')
| -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) | |||
| 222 | unsigned int max, pass; | 222 | unsigned int max, pass; |
| 223 | 223 | ||
| 224 | s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0)); | 224 | s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0)); |
| 225 | /* pcibios_fixup_bus(bus); */ | 225 | pci_fixup_cardbus(bus); |
| 226 | 226 | ||
| 227 | max = bus->secondary; | 227 | max = bus->secondary; |
| 228 | for (pass = 0; pass < 2; pass++) | 228 | for (pass = 0; pass < 2; pass++) |