diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
| commit | 044a500e46742d39d22f1781cfb64ba93b463e39 (patch) | |
| tree | b0313211ea7ba26b90c1083ade0e4c9f486b87db /mm | |
| parent | f6098cf449b81c14a51e48dd22ae47d03126a1de (diff) | |
| parent | 6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 4e9937ac35..391ffc54d1 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -29,7 +29,7 @@ config FLATMEM_MANUAL | |||
| 29 | If unsure, choose this option (Flat Memory) over any other. | 29 | If unsure, choose this option (Flat Memory) over any other. |
| 30 | 30 | ||
| 31 | config DISCONTIGMEM_MANUAL | 31 | config DISCONTIGMEM_MANUAL |
| 32 | bool "Discontigious Memory" | 32 | bool "Discontiguous Memory" |
| 33 | depends on ARCH_DISCONTIGMEM_ENABLE | 33 | depends on ARCH_DISCONTIGMEM_ENABLE |
| 34 | help | 34 | help |
| 35 | This option provides enhanced support for discontiguous | 35 | This option provides enhanced support for discontiguous |
| @@ -52,7 +52,7 @@ config SPARSEMEM_MANUAL | |||
| 52 | memory hotplug systems. This is normal. | 52 | memory hotplug systems. This is normal. |
| 53 | 53 | ||
| 54 | For many other systems, this will be an alternative to | 54 | For many other systems, this will be an alternative to |
| 55 | "Discontigious Memory". This option provides some potential | 55 | "Discontiguous Memory". This option provides some potential |
| 56 | performance benefits, along with decreased code complexity, | 56 | performance benefits, along with decreased code complexity, |
| 57 | but it is newer, and more experimental. | 57 | but it is newer, and more experimental. |
| 58 | 58 | ||