[tip:x86/urgent] x86 VSDO: Fix Kconfig help

[tip-bot for Randy Dunlap]

Commit-ID:  e84446de5cccd90de7d7ec46527d3b343b022a09
Gitweb:     http://git.kernel.org/tip/e84446de5cccd90de7d7ec46527d3b343b022a09
Author:     Randy Dunlap <randy.dunlap@xxxxxxxxxx>
AuthorDate: Tue, 10 Nov 2009 15:46:52 -0800
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 11 Nov 2009 07:26:41 +0100

x86 VSDO: Fix Kconfig help

COMPAT_VDSO has 2 help text blocks, but kconfig only uses the
last one found, so merge the 2 blocks.

It would be real nice if kconfig would warn about this.

Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
LKML-Reference: <4AF9FB6C.70003@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 arch/x86/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 72ace95..618dede 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1602,7 +1602,7 @@ config COMPAT_VDSO
 	depends on X86_32 || IA32_EMULATION
 	---help---
 	  Map the 32-bit VDSO to the predictable old-style address too.
-	---help---
+
 	  Say N here if you are running a sufficiently recent glibc
 	  version (2.3.3 or later), to remove the high-mapped
 	  VDSO mapping and to exclusively use the randomized VDSO.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/