Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 9b8c187873fee6ac53876b8f74f90636074bdb46..7d5a6fbac56a0fe0151b104b079770efd0a32e5d 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1386,15 +1386,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