diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
| commit | 75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch) | |
| tree | 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /arch/m32r/Kconfig.debug | |
| parent | 8531c5ffbca65f6df868637c26e6df6f88bff738 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
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 31039723804f..bbf711bab69e 100644 --- a/arch/m32r/Kconfig.debug +++ b/arch/m32r/Kconfig.debug | |||
| @@ -20,7 +20,7 @@ config DEBUG_STACK_USAGE | |||
| 20 | 20 | ||
| 21 | config DEBUG_PAGEALLOC | 21 | config DEBUG_PAGEALLOC |
| 22 | bool "Page alloc debugging" | 22 | bool "Page alloc debugging" |
| 23 | depends on DEBUG_KERNEL | 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(). |
| 26 | This results in a large slowdown, but helps to find certain types | 26 | This results in a large slowdown, but helps to find certain types |