diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 22:25:27 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 22:25:27 +0300 |
| commit | ed072e447e112f6a6f84e7cc4fc9a1f6e1e653ac (patch) | |
| tree | 92d8a3ff6e916df2e8231618f3d7febfbebd3b7a /drivers/pci | |
| parent | f2a3ce1597b3e1aec96458f80c6cda31a3542b79 (diff) | |
| parent | 265baca69a0735b64227a43d4be865a95ba514bb (diff) | |
| download | linux-ed072e447e112f6a6f84e7cc4fc9a1f6e1e653ac.tar.xz | |
Merge branch 'pci/sysfs'
- Add ARCH_PCI_DEV_GROUPS so s390 can add its own attribute_groups without
having to stomp on the core's pdev->dev.groups (Lukas Wunner)
* pci/sysfs:
s390/pci: Stop usurping pdev->dev.groups
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 40cfa716392f..5d0f4db1cab7 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -31,6 +31,10 @@ #include <linux/aperture.h> #include "pci.h" +#ifndef ARCH_PCI_DEV_GROUPS +#define ARCH_PCI_DEV_GROUPS +#endif + static int sysfs_initialized; /* = 0 */ /* show configuration fields */ @@ -1624,6 +1628,7 @@ const struct attribute_group *pci_dev_groups[] = { &pci_dev_acpi_attr_group, #endif &pci_dev_resource_resize_group, + ARCH_PCI_DEV_GROUPS NULL, }; |