Merge remote-tracking branch 'linus/master' into x86/urgent

[pandora-kernel.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 32f3e5a..169eb7c 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -19,6 +19,13 @@ config RATIONAL
 config GENERIC_FIND_FIRST_BIT
        bool
 
+config GENERIC_PCI_IOMAP
+       bool
+
+config GENERIC_IOMAP
+       bool
+       select GENERIC_PCI_IOMAP
+
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@ -244,6 +251,9 @@ config CPU_RMAP
        bool
        depends on SMP
 
+config DQL
+       bool
+
 #
 # Netlink attribute parsing support is select'ed if needed
 #
@@ -270,10 +280,33 @@ config AVERAGE
          If unsure, say N.
 
 config CORDIC
-       tristate "Cordic function"
+       tristate "CORDIC algorithm"
+       help
+         This option provides an implementation of the CORDIC algorithm;
+         calculations are in fixed point. Module will be called cordic.
+
+config MPILIB
+       tristate
+       help
+         Multiprecision maths library from GnuPG.
+         It is used to implement RSA digital signature verification,
+         which is used by IMA/EVM digital signature extension.
+
+config MPILIB_EXTRA
+       bool
+       depends on MPILIB
+       help
+         Additional sources of multiprecision maths library from GnuPG.
+         This code is unnecessary for RSA digital signature verification,
+         but can be compiled if needed.
+
+config SIGNATURE
+       tristate
+       depends on KEYS && CRYPTO
+       select CRYPTO_SHA1
+       select MPILIB
        help
-         The option provides arithmetic function using cordic algorithm
-         so its calculations are in fixed point. Modules can select this
-         when they require this function. Module will be called cordic.
+         Digital signature verification. Currently only RSA is supported.
+         Implementation is done using GnuPG MPI library
 
 endmenu