diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-03-12 18:14:21 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-03-12 18:14:21 +0100 |
| commit | 420b8c36069587abf77d2b51fbaa24e9fc5dda67 (patch) | |
| tree | d75eafb1d12ed8142bba7a8f8162337c6e3466e7 /drivers/pci/Makefile | |
| parent | Merge branch 'pci/dpc' (diff) | |
| parent | PCI: Mark 3ware-9650SE Root Port Extended Tags as broken (diff) | |
| download | linux-420b8c36069587abf77d2b51fbaa24e9fc5dda67.tar.xz linux-420b8c36069587abf77d2b51fbaa24e9fc5dda67.zip | |
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/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index ed65299b42b5..147779831b13 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_PCI) += access.o bus.o probe.o host-bridge.o \ remove.o pci.o pci-driver.o search.o \ pci-sysfs.o rom.o setup-res.o irq.o vpd.o \ - setup-bus.o vc.o mmap.o setup-irq.o devres.o + setup-bus.o vc.o mmap.o devres.o obj-$(CONFIG_PCI) += msi/ obj-$(CONFIG_PCI) += pcie/ |