diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:34:08 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:34:08 +0200 |
| commit | a3536c839f04682ed06c84a7f75968c27c6108c8 (patch) | |
| tree | 92c26ea74c0ffb9b83a2285ad2539cc271b09856 /mm/Kconfig | |
| parent | [PATCH] Updated ipw2200 to compile with ieee80211 abg_ture to abg_true change (diff) | |
| parent | [PATCH] uml: fix compile warning after consolidation patch (diff) | |
| download | linux-a3536c839f04682ed06c84a7f75968c27c6108c8.tar.xz linux-a3536c839f04682ed06c84a7f75968c27c6108c8.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'mm/Kconfig')
| -rw-r--r-- | mm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 4e9937ac3529..391ffc54d136 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -29,7 +29,7 @@ config FLATMEM_MANUAL If unsure, choose this option (Flat Memory) over any other. config DISCONTIGMEM_MANUAL - bool "Discontigious Memory" + bool "Discontiguous Memory" depends on ARCH_DISCONTIGMEM_ENABLE help This option provides enhanced support for discontiguous @@ -52,7 +52,7 @@ config SPARSEMEM_MANUAL memory hotplug systems. This is normal. For many other systems, this will be an alternative to - "Discontigious Memory". This option provides some potential + "Discontiguous Memory". This option provides some potential performance benefits, along with decreased code complexity, but it is newer, and more experimental. |