From 30b5b8808c12bcd947dd474980482561b69c1bcb Mon Sep 17 00:00:00 2001 From: Tero Roponen Date: Mon, 21 Mar 2016 09:26:41 +0200 Subject: PCI: Restore inclusion of pci/hotplug Kconfig Commit e7e127e3c767 ("PCI: Include pci/hotplug Kconfig directly from pci/Kconfig") added one line to pci/Kconfig. However, for some mysterious reason it isn't there now, even though there are no traces of removing it in the git log. I detected this issue when 'make oldconfig' removed all the options that depended on HOTPLUG_PCI. [bhelgaas: I botched the cfeb8139a1fb ("Merge branch 'pci/host-hv' into next") merge. "git diff cfeb8139a1fb^ cfeb8139a1fb" shows a conflict in drivers/pci/Kconfig, and I mistakenly dropped the hotplug/Kconfig piece.] Signed-off-by: Tero Roponen Signed-off-by: Bjorn Helgaas diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index a1f37db..209292e 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" -- cgit v0.10.2 From 9188269a2e8ea5b32affef99d42c5eda91c07fdf Mon Sep 17 00:00:00 2001 From: Sekhar Nori Date: Fri, 4 Mar 2016 15:59:19 +0530 Subject: Revert "PCI: dra7xx: Mark driver as broken" Revert 5c3b99d05752 ("PCI: dra7xx: Mark driver as broken"). 1c96bee4df19 ("ARM: DRA7: hwmod: Add custom reset handler for PCIeSS") added support to de-assert PCIe reset, so DRA7x PCIe is not broken anymore. Signed-off-by: Sekhar Nori Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Bjorn Helgaas diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index c5014bf..7a0780d 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 -- cgit v0.10.2