PCI: Move PCI_QUIRKS to the PCI bus menu

Localize PCI_QUIRKS in the PCI bus menu.

Move PCI_QUIRKS to the PCI bus menu instead of the (often broken) General
Setup EXPERT menu.  The prompt still depends on EXPERT.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index c32a77fc8b03a5ff876768ade086c818dee3a116..658d40af887a815a8a2e799b34b20acfbb716064 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -29,6 +29,15 @@ config PCI_MSI_IRQ_DOMAIN
        depends on PCI_MSI
        select GENERIC_MSI_IRQ_DOMAIN
 
+config PCI_QUIRKS
+       default y
+       bool "Enable PCI quirk workarounds" if EXPERT
+       depends on PCI
+       help
+         This enables workarounds for various PCI chipset bugs/quirks.
+         Disable this only if your target machine is unaffected by PCI
+         quirks.
+
 config PCI_DEBUG
        bool "PCI Debugging"
        depends on PCI && DEBUG_KERNEL

diff --git a/init/Kconfig b/init/Kconfig
index 78cb2461012ef530f2755a0a6a8458428ed19043..b5a1cb415f465f480c4569609d911763e350a39d 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1379,15 +1379,6 @@ config USERFAULTFD
          Enable the userfaultfd() system call that allows to intercept and
          handle page faults in userland.
 
-config PCI_QUIRKS
-       default y
-       bool "Enable PCI quirk workarounds" if EXPERT
-       depends on PCI
-       help
-         This enables workarounds for various PCI chipset
-         bugs/quirks. Disable this only if your target machine is
-         unaffected by PCI quirks.
-
 config MEMBARRIER
        bool "Enable membarrier() system call" if EXPERT
        default y