diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2022-03-22 17:16:20 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-03-22 17:16:20 -0500 |
commit | fde14ee6293efc5bbde6caf7b8c6ebb2f1fb203a (patch) | |
tree | d79f80ad361573653583cd0d76cc14ccd7b1952b /drivers/pci/hotplug | |
parent | 05ca7e5058ab564195f0b7ee5b81623ca36acb53 (diff) | |
parent | fe665816e0d4ff4945c8ca720278023a4d05a6b3 (diff) | |
download | linux-fde14ee6293efc5bbde6caf7b8c6ebb2f1fb203a.tar.gz linux-fde14ee6293efc5bbde6caf7b8c6ebb2f1fb203a.tar.bz2 linux-fde14ee6293efc5bbde6caf7b8c6ebb2f1fb203a.zip |
Merge branch 'pci/bridge-class-codes'
- Add and use #defines for normal and subtractive PCI bridges (Pali Rohár)
- Set all 24 bits of PCI class code for iproc (Pali Rohár)
* pci/bridge-class-codes:
PCI: iproc: Set all 24 bits of PCI class code
PCI: Add defines for normal and subtractive PCI bridges
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r-- | drivers/pci/hotplug/shpchp_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index 81a918d47895..53692b048301 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c @@ -312,7 +312,7 @@ static void shpc_remove(struct pci_dev *dev) } static const struct pci_device_id shpcd_pci_tbl[] = { - {PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0)}, + {PCI_DEVICE_CLASS(PCI_CLASS_BRIDGE_PCI_NORMAL, ~0)}, { /* end: all zeroes */ } }; MODULE_DEVICE_TABLE(pci, shpcd_pci_tbl); |