diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /lib/Kconfig.debug | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'lib/Kconfig.debug')
| -rw-r--r-- | lib/Kconfig.debug | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index df9234c5f9d1..c768bcdda1b7 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -434,11 +434,9 @@ config DEBUG_KMEMLEAK_EARLY_LOG_SIZE | |||
| 434 | 434 | ||
| 435 | config DEBUG_KMEMLEAK_TEST | 435 | config DEBUG_KMEMLEAK_TEST |
| 436 | tristate "Simple test for the kernel memory leak detector" | 436 | tristate "Simple test for the kernel memory leak detector" |
| 437 | depends on DEBUG_KMEMLEAK | 437 | depends on DEBUG_KMEMLEAK && m |
| 438 | help | 438 | help |
| 439 | Say Y or M here to build a test for the kernel memory leak | 439 | This option enables a module that explicitly leaks memory. |
| 440 | detector. This option enables a module that explicitly leaks | ||
| 441 | memory. | ||
| 442 | 440 | ||
| 443 | If unsure, say N. | 441 | If unsure, say N. |
| 444 | 442 | ||