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.h | |
| 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.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index d1182c4a754e..816c297f170c 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -151,7 +151,7 @@ static inline int pci_no_d1d2(struct pci_dev *dev) | |||
| 151 | 151 | ||
| 152 | } | 152 | } |
| 153 | extern struct device_attribute pci_dev_attrs[]; | 153 | extern struct device_attribute pci_dev_attrs[]; |
| 154 | extern struct device_attribute pcibus_dev_attrs[]; | 154 | extern const struct attribute_group *pcibus_groups[]; |
| 155 | extern struct device_type pci_dev_type; | 155 | extern struct device_type pci_dev_type; |
| 156 | extern struct bus_attribute pci_bus_attrs[]; | 156 | extern struct bus_attribute pci_bus_attrs[]; |
| 157 | 157 | ||