diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 14:24:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 14:24:19 -0400 |
| commit | 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 (patch) | |
| tree | f846fcbf6b756b76834e06e412a8248bbfb55b32 /drivers/pci/probe.c | |
| parent | 6a5d263866d699ebf6843105497afc86ee53de5b (diff) | |
| parent | 72800360fdd782eda3489e555adf3b6b3abc064a (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: pci_slot: grab refcount on slot's bus
PCI Hotplug: acpiphp: grab refcount on p2p subordinate bus
PCI: allow PCI core hotplug to remove PCI root bus
PCI: Fix oops in pci_vpd_truncate
PCI: don't corrupt enable_cnt when doing manual resource alignment
PCI: annotate pci_rescan_bus as __ref, not __devinit
PCI-IOV: fix missing kernel-doc
PCI: Setup disabled bridges even if buses are added
PCI: SR-IOV quirk for Intel 82576 NIC
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index e2f3dd098cfa..8eb50dffb78a 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -1220,7 +1220,7 @@ EXPORT_SYMBOL(pci_scan_bus_parented); | |||
| 1220 | * | 1220 | * |
| 1221 | * Returns the max number of subordinate bus discovered. | 1221 | * Returns the max number of subordinate bus discovered. |
| 1222 | */ | 1222 | */ |
| 1223 | unsigned int __devinit pci_rescan_bus(struct pci_bus *bus) | 1223 | unsigned int __ref pci_rescan_bus(struct pci_bus *bus) |
| 1224 | { | 1224 | { |
| 1225 | unsigned int max; | 1225 | unsigned int max; |
| 1226 | struct pci_dev *dev; | 1226 | struct pci_dev *dev; |