diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 20:24:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 20:24:19 +0200 |
| commit | 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 (patch) | |
| tree | f846fcbf6b756b76834e06e412a8248bbfb55b32 /drivers/pci/iov.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | PCI: pci_slot: grab refcount on slot's bus (diff) | |
| download | linux-8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6.tar.xz linux-8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6.zip | |
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/iov.c')
| -rw-r--r-- | drivers/pci/iov.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 7227efc760db..b497daab3d4a 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -631,6 +631,7 @@ int pci_iov_bus_range(struct pci_bus *bus) /** * pci_enable_sriov - enable the SR-IOV capability * @dev: the PCI device + * @nr_virtfn: number of virtual functions to enable * * Returns 0 on success, or negative on failure. */ |