Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc739eba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 87cf815b 9188269a

drivers/pci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/pci/host/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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