diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-01 15:54:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-01 18:49:02 -0400 |
| commit | 8302294f43250dc337108c51882a6007f2b1e2e0 (patch) | |
| tree | 85acd4440799c46a372df9cad170fa0c21e59096 /lib/Kconfig | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
| parent | 2e572895bf3203e881356a4039ab0fa428ed2639 (diff) | |
Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 2a9c69f34482..8ade0a7a91e0 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -2,6 +2,9 @@ | |||
| 2 | # Library configuration | 2 | # Library configuration |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | config BINARY_PRINTF | ||
| 6 | def_bool n | ||
| 7 | |||
| 5 | menu "Library routines" | 8 | menu "Library routines" |
| 6 | 9 | ||
| 7 | config BITREVERSE | 10 | config BITREVERSE |