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.