Commit 08d6c8fc authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/kconfig' 

  - Remove unnecessary "default y" Kconfig options (Bjorn Helgaas)

* pci/kconfig:
  PCI/AER: Don't select CONFIG_PCIEAER by default
  PCI: keystone: Don't select CONFIG_PCI_KEYSTONE_HOST by default
  PCI: dra7xx: Don't select CONFIG_PCI_DRA7XX_HOST by default
parents 1a765adf 8c8ff55b

drivers/pci/controller/dwc/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ config PCI_DRA7XX_HOST 
	depends on OF && HAS_IOMEM && TI_PIPE3

	depends on OF && HAS_IOMEM && TI_PIPE3

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	select PCI_DRA7XX

	select PCI_DRA7XX

	default y

	default y if SOC_DRA7XX

	help

	help

	  Enables support for the PCIe controller in the DRA7xx SoC to work in

	  Enables support for the PCIe controller in the DRA7xx SoC to work in

	  host mode. There are two instances of PCIe controller in DRA7xx.

	  host mode. There are two instances of PCIe controller in DRA7xx.
@@ -111,7 +111,6 @@ config PCI_KEYSTONE_HOST 
	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	select PCI_KEYSTONE

	select PCI_KEYSTONE

	default y

	help

	help

	  Enables support for the PCIe controller in the Keystone SoC to

	  Enables support for the PCIe controller in the Keystone SoC to

	  work in host mode. The PCI controller on Keystone is based on

	  work in host mode. The PCI controller on Keystone is based on

drivers/pci/pcie/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ config PCIEAER 
	bool "PCI Express Advanced Error Reporting support"

	bool "PCI Express Advanced Error Reporting support"

	depends on PCIEPORTBUS

	depends on PCIEPORTBUS

	select RAS

	select RAS

	default y

	help

	help

	  This enables PCI Express Root Port Advanced Error Reporting

	  This enables PCI Express Root Port Advanced Error Reporting

	  (AER) driver support. Error reporting messages sent to Root

	  (AER) driver support. Error reporting messages sent to Root