diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:51 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:51 -0500 |
| commit | 83e168d607d6783db5c18203076d3785b20e7f9e (patch) | |
| tree | 33c8f9a19dd02dbb70b877ee0acefdfa739baae0 /arch | |
| parent | 581e8fcec53c61b015ccd5ad1c169c7bfa220856 (diff) | |
| parent | 370ea5aa50d66c6447300d23467cdd1efd0efa72 (diff) | |
Merge branch 'pci/host/mt7621'
- Add MediaTek MT7621 SoC PCIe host controller (moved from staging) (Sergio
Paracuellos)
* pci/host/mt7621:
MAINTAINERS: Add Sergio Paracuellos as MT7621 PCIe maintainer
PCI: mt7621: Add MediaTek MT7621 PCIe host controller driver
dt-bindings: PCI: Add MT7621 SoC PCIe host controller
# Conflicts:
# drivers/pci/controller/Kconfig
# drivers/pci/controller/Makefile
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/ralink/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig index c800bf5559b5..120adad51d6a 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -51,7 +51,8 @@ choice select SYS_SUPPORTS_HIGHMEM select MIPS_GIC select CLKSRC_MIPS_GIC - select HAVE_PCI if PCI_MT7621 + select HAVE_PCI + select PCI_DRIVERS_GENERIC select SOC_BUS endchoice |