diff --git a/[refs] b/[refs] index 0dbba822139c..830208a65743 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9491ac835829e6a34e2bbaa8adad261c71bf990 +refs/heads/master: f3519f91942f2b43942400348c16d63fe9327f04 diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index 4e9937ac3529..391ffc54d136 100644 --- a/trunk/mm/Kconfig +++ b/trunk/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.