Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

1 files changed, 14 insertions, 0 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 830181cc7a83..32f3e5ae2be5 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -79,6 +79,13 @@ config LIBCRC32C
           require M here.  See Castagnoli93.
           Module will be libcrc32c.
 
+config CRC8
+        tristate "CRC8 function"
+        help
+          This option provides CRC8 function. Drivers may select this
+          when they need to do cyclic redundancy check according CRC8
+          algorithm. Module will be called crc8.
+
 config AUDIT_GENERIC
         bool
         depends on AUDIT && !AUDIT_ARCH
@@ -262,4 +269,11 @@ config AVERAGE
 
           If unsure, say N.
 
+config CORDIC
+        tristate "Cordic function"
+        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.
+
 endmenu