From 8d42dd9783f6ad73505d086494a4fb0b90192dba Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 16 Dec 2009 12:20:00 +0100 Subject: [PATCH] --- yaml --- r: 177635 b: refs/heads/master c: 413f9efbc513d330f00352bb7cba060a729999d3 h: refs/heads/master i: 177633: 50aa550c586fbb345d285ebd78eeed00624f0eee 177631: 76b1286f049149eb39c521394df193ccc819e43b v: v3 --- [refs] | 2 +- trunk/mm/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 674fc078c4c0..7de919371a27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d15f107d97bd74c74d8f5144843d372666ddbdac +refs/heads/master: 413f9efbc513d330f00352bb7cba060a729999d3 diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index 8cea7fde06e1..43ea8c3a2bbf 100644 --- a/trunk/mm/Kconfig +++ b/trunk/mm/Kconfig @@ -251,7 +251,7 @@ config MEMORY_FAILURE special hardware support and typically ECC memory. config HWPOISON_INJECT - tristate "Poison pages injector" + tristate "HWPoison pages injector" depends on MEMORY_FAILURE && DEBUG_KERNEL select PROC_PAGE_MONITOR