diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2024-03-12 20:14:21 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-03-12 20:14:21 +0300 |
commit | 420b8c36069587abf77d2b51fbaa24e9fc5dda67 (patch) | |
tree | d75eafb1d12ed8142bba7a8f8162337c6e3466e7 /drivers/pci/pci-driver.c | |
parent | c6c411a9489bd16c13e326fb503b46e5322d6eae (diff) | |
parent | baf67aefbe7d7deafa59ca49612d163f8889934c (diff) | |
download | linux-420b8c36069587abf77d2b51fbaa24e9fc5dda67.tar.xz |
Merge branch 'pci/enumeration'
- Collect interrupt-related code in irq.c (Ilpo Järvinen)
- Mark 3ware-9650SE Root Port Extended Tags as broken (Jörg Wedekind)
* pci/enumeration:
PCI: Mark 3ware-9650SE Root Port Extended Tags as broken
PCI: Place interrupt related code into irq.c
# Conflicts:
# drivers/pci/Makefile
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r-- | drivers/pci/pci-driver.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 51ec9e7e784f..ec838f2e892e 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -419,15 +419,6 @@ static int __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev) return error; } -int __weak pcibios_alloc_irq(struct pci_dev *dev) -{ - return 0; -} - -void __weak pcibios_free_irq(struct pci_dev *dev) -{ -} - #ifdef CONFIG_PCI_IOV static inline bool pci_device_can_probe(struct pci_dev *pdev) { |