diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-01 13:03:52 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-01 13:03:52 -0400 |
| commit | cbe2bb4f2bc14876ab9e1729933a7453ded250d1 (patch) | |
| tree | 4662c8812671996e0f39f8ac1b6e21e700a630d7 /drivers/pci/pci.c | |
| parent | 28fa60a83034fbbb74dcf4bb6025b5b28bd21ea8 (diff) | |
| parent | ce1be10bf6dc8406ae773f0ac6265585a4154d37 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Fix comment typo for pci_add_cap_save_buffer()
PCI: Return -ENOSYS for SR-IOV operations on non-SR-IOV devices
PCI: Update NumVFs register when disabling SR-IOV
x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero
PCI: Convert class code to use dev_groups
frv/PCI: Mark pcibios_fixup_bus() as non-init
x86/pci/mrst: Cleanup checkpatch.pl warnings
PCI: Rename "PCI Express support" kconfig title
PCI: Fix comment typo in iov.c
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index a599a6bbdf37..a8d5fd064264 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -1992,7 +1992,7 @@ static void pci_add_saved_cap(struct pci_dev *pci_dev, | |||
| 1992 | } | 1992 | } |
| 1993 | 1993 | ||
| 1994 | /** | 1994 | /** |
| 1995 | * pci_add_save_buffer - allocate buffer for saving given capability registers | 1995 | * pci_add_cap_save_buffer - allocate buffer for saving given capability registers |
| 1996 | * @dev: the PCI device | 1996 | * @dev: the PCI device |
| 1997 | * @cap: the capability to allocate the buffer for | 1997 | * @cap: the capability to allocate the buffer for |
| 1998 | * @size: requested size of the buffer | 1998 | * @size: requested size of the buffer |