diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/m32r/Kconfig.debug | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/m32r/Kconfig.debug')
| -rw-r--r-- | arch/m32r/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/Kconfig.debug b/arch/m32r/Kconfig.debug index bbf711bab69e..2e1019ddbb22 100644 --- a/arch/m32r/Kconfig.debug +++ b/arch/m32r/Kconfig.debug | |||
| @@ -19,7 +19,7 @@ config DEBUG_STACK_USAGE | |||
| 19 | This option will slow down process creation somewhat. | 19 | This option will slow down process creation somewhat. |
| 20 | 20 | ||
| 21 | config DEBUG_PAGEALLOC | 21 | config DEBUG_PAGEALLOC |
| 22 | bool "Page alloc debugging" | 22 | bool "Debug page memory allocations" |
| 23 | depends on DEBUG_KERNEL && BROKEN | 23 | depends on DEBUG_KERNEL && BROKEN |
| 24 | help | 24 | help |
| 25 | Unmap pages from the kernel linear mapping after free_pages(). | 25 | Unmap pages from the kernel linear mapping after free_pages(). |