From 42e1260e673f7e9b0f4cde5ccf57137d26ebf14d Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 10 May 2005 17:36:29 +0100 Subject: [PATCH] --- yaml --- r: 1103 b: refs/heads/master c: fa4354359f800ef9d68ed644438efd45b559b443 h: refs/heads/master i: 1101: 9a072bca1ff4721104050e1a2ffcc4a974efb76c 1099: 652e0c3d3ca07d73251c4e4626dc3b4e74030773 1095: 41b22c5c567e18295f3db6d117c63c9cdc523b66 1087: 7cd58aec3bd4f5a735a84e39081df8c706e1ebf2 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 266216c57a83..4ac44ffbcf9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d802d28c23122a57d7dddf4886b0486ca183d2d +refs/heads/master: fa4354359f800ef9d68ed644438efd45b559b443 diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig index c4fc6be629de..07646d25e265 100644 --- a/trunk/arch/arm/mm/Kconfig +++ b/trunk/arch/arm/mm/Kconfig @@ -427,6 +427,6 @@ config HAS_TLS_REG help This selects support for the CP15 thread register. It is defined to be available on ARMv6 or later. If a particular - ARMv6 or later CPU doesn't support it then it must omc;ide "select - TLS_REG_EMUL" along with its other caracteristics. + ARMv6 or later CPU doesn't support it then it must include "select + TLS_REG_EMUL" along with its other characteristics.