From 9bf86f7c8dd133262d6080419915d6f57d3256ba Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 31 Dec 2012 12:42:51 -0800 Subject: [PATCH] --- yaml --- r: 350680 b: refs/heads/master c: 236d6a77eeac702abb8e908a6ec11a37507c5071 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/atkbd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f1293dcf6f6b..0f95cde83ab6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a0b6c5d14bbaf62a4f19131ac16ac81ed909fda +refs/heads/master: 236d6a77eeac702abb8e908a6ec11a37507c5071 diff --git a/trunk/drivers/input/keyboard/atkbd.c b/trunk/drivers/input/keyboard/atkbd.c index add5ffd9fe26..33d0fcde441c 100644 --- a/trunk/drivers/input/keyboard/atkbd.c +++ b/trunk/drivers/input/keyboard/atkbd.c @@ -726,7 +726,7 @@ static int atkbd_probe(struct atkbd *atkbd) if (atkbd->id == 0xaca1 && atkbd->translated) { dev_err(&ps2dev->serio->dev, - "NCD terminal keyboards are only supported on non-translating controlelrs. " + "NCD terminal keyboards are only supported on non-translating controllers. " "Use i8042.direct=1 to disable translation.\n"); return -1; }