diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-10-31 13:50:08 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-10-31 13:50:08 -0600 |
| commit | f36c493491df1c83d6fee03433dd9ceaf2563e8b (patch) | |
| tree | c6f505d1ef469efdad9d19bf9c22f7ac70cfae2d /drivers/pci/pci.h | |
| parent | 605d240052473228bf0c8c051cad825fddb25502 (diff) | |
| parent | bf22c90fb190e837173d61368e3c80f5b78751a8 (diff) | |
Merge branch 'pci/gregkh-driver-core' into next
* pci/gregkh-driver-core:
PCI: Make pci_bus_attrs, pci_dev_attrs, dev_rescan_attr, dev_remove_attr, vga_attr static
PCI: convert bus code to use dev_groups
PCI: convert bus code to use drv_groups
PCI: convert bus code to use bus_groups
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 8a00c063d7b..9c91ecc1301 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -153,10 +153,10 @@ static inline int pci_no_d1d2(struct pci_dev *dev) return (dev->no_d1d2 || parent_dstates); } -extern struct device_attribute pci_dev_attrs[]; +extern const struct attribute_group *pci_dev_groups[]; extern const struct attribute_group *pcibus_groups[]; extern struct device_type pci_dev_type; -extern struct bus_attribute pci_bus_attrs[]; +extern const struct attribute_group *pci_bus_groups[]; /** |