diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2023-02-22 22:47:32 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2023-02-22 22:47:32 +0300 |
commit | 3eb5d0f26f4ea604e83ca499a72c0d33638f4765 (patch) | |
tree | 5eff6f92c560cff66deb8640c839fbe3a6f09a31 /drivers/pci/controller/Kconfig | |
parent | 90fb1a36528b5a52583c49483ca597beeb7f5435 (diff) | |
parent | 9574d57f2d43361e2e796ace8b055f4359261ba1 (diff) | |
download | linux-3eb5d0f26f4ea604e83ca499a72c0d33638f4765.tar.xz |
Merge branch 'pci/misc'
- Drop bogus kernel-doc marker in pci_endpoint_test.c (Randy Dunlap)
- Fix epf_ntb_mw_bar_clear() kernel-doc (Yang Yingliang)
- Constify struct kobj_type pci_slot_ktype (Thomas Weißschuh)
* pci/misc:
PCI: hv: Drop duplicate PCI_MSI dependency
PCI/sysfs: Constify struct kobj_type pci_slot_ktype
PCI: endpoint: pci-epf-vntb: Add epf_ntb_mw_bar_clear() num_mws kernel-doc
misc: pci_endpoint_test: Drop initial kernel-doc marker
Diffstat (limited to 'drivers/pci/controller/Kconfig')
-rw-r--r-- | drivers/pci/controller/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index b4a4d84a358b..0ca6ec9e4c70 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -286,7 +286,7 @@ config PCIE_BRCMSTB config PCI_HYPERV_INTERFACE tristate "Hyper-V PCI Interface" - depends on ((X86 && X86_64) || ARM64) && HYPERV && PCI_MSI && PCI_MSI + depends on ((X86 && X86_64) || ARM64) && HYPERV && PCI_MSI help The Hyper-V PCI Interface is a helper driver allows other drivers to have a common interface with the Hyper-V PCI frontend driver. |