diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /arch/powerpc/platforms/pseries/Kconfig | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/platforms/pseries/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/pseries/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 97619fd51e39..ddc2a307cd50 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig | |||
| @@ -54,7 +54,7 @@ config PPC_SMLPAR | |||
| 54 | 54 | ||
| 55 | config CMM | 55 | config CMM |
| 56 | tristate "Collaborative memory management" | 56 | tristate "Collaborative memory management" |
| 57 | depends on PPC_SMLPAR | 57 | depends on PPC_SMLPAR && !CRASH_DUMP |
| 58 | default y | 58 | default y |
| 59 | help | 59 | help |
| 60 | Select this option, if you want to enable the kernel interface | 60 | Select this option, if you want to enable the kernel interface |