From: Randy Dunlap <[email protected]>

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 <[email protected]>
---
 drivers/pci/Kconfig |    9 +++++++++
 init/Kconfig        |    9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

--- lnx-414-rc7.orig/drivers/pci/Kconfig
+++ lnx-414-rc7/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
--- lnx-414-rc7.orig/init/Kconfig
+++ lnx-414-rc7/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


Reply via email to