Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index f6299342b882d86f56b70655879b5c8ba792f3d4..384249915047f0e28f8f82c10caa6b9795f4fb3b 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -4,6 +4,9 @@
 
 menu "Library routines"
 
+config BITREVERSE
+       tristate
+
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@ -23,6 +26,7 @@ config CRC16
 config CRC32
        tristate "CRC32 functions"
        default y
+       select BITREVERSE
        help
          This option is provided for the case where no in-kernel-tree
          modules require CRC32 functions, but a module built outside the
@@ -38,6 +42,11 @@ config LIBCRC32C
          require M here.  See Castagnoli93.
          Module will be libcrc32c.
 
+config AUDIT_GENERIC
+       bool
+       depends on AUDIT && !AUDIT_ARCH
+       default y
+
 #
 # compression support is select'ed if needed
 #
@@ -92,4 +101,14 @@ config TEXTSEARCH_FSM
 config PLIST
        boolean
 
+config HAS_IOMEM
+       boolean
+       depends on !NO_IOMEM
+       default y
+
+config HAS_IOPORT
+       boolean
+       depends on HAS_IOMEM && !NO_IOPORT
+       default y
+
 endmenu