git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing/core-v2' into tracing-for-linus
[safe/jmp/linux-2.6]
/
lib
/
Kconfig
diff --git
a/lib/Kconfig
b/lib/Kconfig
index
7823f83
..
8ade0a7
100644
(file)
--- a/
lib/Kconfig
+++ b/
lib/Kconfig
@@
-2,6
+2,9
@@
# Library configuration
#
# Library configuration
#
+config BINARY_PRINTF
+ def_bool n
+
menu "Library routines"
config BITREVERSE
menu "Library routines"
config BITREVERSE
@@
-13,6
+16,10
@@
config GENERIC_FIND_FIRST_BIT
config GENERIC_FIND_NEXT_BIT
bool
config GENERIC_FIND_NEXT_BIT
bool
+config GENERIC_FIND_LAST_BIT
+ bool
+ default y
+
config CRC_CCITT
tristate "CRC-CCITT functions"
help
config CRC_CCITT
tristate "CRC-CCITT functions"
help
@@
-64,6
+71,8
@@
config CRC7
config LIBCRC32C
tristate "CRC32c (Castagnoli, et al) Cyclic Redundancy-Check"
config LIBCRC32C
tristate "CRC32c (Castagnoli, et al) Cyclic Redundancy-Check"
+ select CRYPTO
+ select CRYPTO_CRC32C
help
This option is provided for the case where no in-kernel-tree
modules require CRC32c functions, but a module built outside the
help
This option is provided for the case where no in-kernel-tree
modules require CRC32c functions, but a module built outside the
@@
-92,6
+101,20
@@
config LZO_DECOMPRESS
tristate
#
tristate
#
+# These all provide a common interface (hence the apparent duplication with
+# ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
+#
+config DECOMPRESS_GZIP
+ select ZLIB_INFLATE
+ tristate
+
+config DECOMPRESS_BZIP2
+ tristate
+
+config DECOMPRESS_LZMA
+ tristate
+
+#
# Generic allocator support is selected if needed
#
config GENERIC_ALLOCATOR
# Generic allocator support is selected if needed
#
config GENERIC_ALLOCATOR
@@
-130,12
+153,6
@@
config TEXTSEARCH_BM
config TEXTSEARCH_FSM
tristate
config TEXTSEARCH_FSM
tristate
-#
-# plist support is select#ed if needed
-#
-config PLIST
- boolean
-
config HAS_IOMEM
boolean
depends on !NO_IOMEM
config HAS_IOMEM
boolean
depends on !NO_IOMEM
@@
-164,4
+181,14
@@
config CPUMASK_OFFSTACK
them on the stack. This is a bit more expensive, but avoids
stack overflow.
them on the stack. This is a bit more expensive, but avoids
stack overflow.
+config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
+ bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
+ depends on EXPERIMENTAL && BROKEN
+
+#
+# Netlink attribute parsing support is select'ed if needed
+#
+config NLATTR
+ bool
+
endmenu
endmenu