Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux13...

[~andy/linux] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 734ce95a93d121ab892fdadcf0f51a54079e5747..2e7ae6b9215b2d390d30171c4e61e000f7079705 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
@@ -20,9 +23,18 @@ config CRC16
          the kernel tree does. Such modules that use library CRC16
          functions require M here.
 
+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
+       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
@@ -97,4 +109,19 @@ 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
+
+config HAS_DMA
+       boolean
+       depends on !NO_DMA
+       default y
+
 endmenu