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

[pandora-kernel.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 3842499..c7ad7a5 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -7,6 +7,12 @@ menu "Library routines"
 config BITREVERSE
        tristate
 
+config GENERIC_FIND_FIRST_BIT
+       def_bool n
+
+config GENERIC_FIND_NEXT_BIT
+       def_bool n
+
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@ -23,6 +29,21 @@ config CRC16
          the kernel tree does. Such modules that use library CRC16
          functions require M here.
 
+config CRC_T10DIF
+       tristate "CRC calculation for the T10 Data Integrity Field"
+       help
+         This option is only needed if a module that's not in the
+         kernel tree needs to calculate CRC checks for use with the
+         SCSI data integrity subsystem.
+
+config CRC_ITU_T
+       tristate "CRC ITU-T V.41 functions"
+       help
+         This option is provided for the case where no in-kernel-tree
+         modules require CRC ITU-T V.41 functions, but a module built outside
+         the kernel tree does. Such modules that use library CRC ITU-T V.41
+         functions require M here.
+
 config CRC32
        tristate "CRC32 functions"
        default y
@@ -33,6 +54,14 @@ config CRC32
          kernel tree does. Such modules that use library CRC32 functions
          require M here.
 
+config CRC7
+       tristate "CRC7 functions"
+       help
+         This option is provided for the case where no in-kernel-tree
+         modules require CRC7 functions, but a module built outside
+         the kernel tree does. Such modules that use library CRC7
+         functions require M here.
+
 config LIBCRC32C
        tristate "CRC32c (Castagnoli, et al) Cyclic Redundancy-Check"
        help
@@ -56,6 +85,12 @@ config ZLIB_INFLATE
 config ZLIB_DEFLATE
        tristate
 
+config LZO_COMPRESS
+       tristate
+
+config LZO_DECOMPRESS
+       tristate
+
 #
 # Generic allocator support is selected if needed
 #
@@ -111,4 +146,15 @@ config HAS_IOPORT
        depends on HAS_IOMEM && !NO_IOPORT
        default y
 
+config HAS_DMA
+       boolean
+       depends on !NO_DMA
+       default y
+
+config CHECK_SIGNATURE
+       bool
+
+config HAVE_LMB
+       boolean
+
 endmenu