Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

[linux-2.6.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 5634e47..201e1b3 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,11 +280,10 @@ config AVERAGE
          If unsure, say N.
 
 config CORDIC
-       tristate "Cordic function"
+       tristate "CORDIC algorithm"
        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.
+         This option provides an implementation of the CORDIC algorithm;
+         calculations are in fixed point. Module will be called cordic.
 
 config MPILIB
        tristate "Multiprecision maths library"