diff options
| author | Linus Torvalds | 2016-03-22 12:26:04 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2016-03-22 12:26:04 -0700 |
| commit | fc739eba99dc8655369a07ead098de9960e48fff (patch) | |
| tree | 1fe9f12f793e8075645228d9ec4ea08e85698ffa /drivers | |
| parent | 87cf815b9e78af20bf139aa7536b42be2ce405c5 (diff) | |
| parent | 9188269a2e8ea5b32affef99d42c5eda91c07fdf (diff) | |
Merge tag 'pci-v4.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Here are two fixes for v4.6:
- You merged a fix for a TI DRA7xx reset issue from another source,
so Sekhar removed the "broken" tag from the driver, and
- I botched a Kconfig merge and broke hotplug configuration for
everybody, so Tero fixed that.
Summary:
TI DRA7xx host bridge driver:
Revert "PCI: dra7xx: Mark driver as broken" (Sekhar Nori)
Miscellaneous:
Restore inclusion of pci/hotplug Kconfig (Tero Roponen)"
* tag 'pci-v4.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
Revert "PCI: dra7xx: Mark driver as broken"
PCI: Restore inclusion of pci/hotplug Kconfig
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/pci/host/Kconfig | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index a1f37db745ab..209292e067d2 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -128,4 +128,5 @@ config PCI_HYPERV The PCI device frontend driver allows the kernel to import arbitrary PCI devices from a PCI backend to support PCI driver domains. +source "drivers/pci/hotplug/Kconfig" source "drivers/pci/host/Kconfig" diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index c5014bf95a20..7a0780d56d2d 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -5,7 +5,6 @@ config PCI_DRA7XX bool "TI DRA7xx PCIe controller" select PCIE_DW depends on OF && HAS_IOMEM && TI_PIPE3 - depends on BROKEN help Enables support for the PCIe controller in the DRA7xx SoC. There are two instances of PCIe controller in DRA7xx. This controller can |