---

yaml --- r: 350680 b: refs/heads/master c: 236d6a7 h: refs/heads/master v: v3
git-mirror · Jan 17, 2013 · 9bf86f7 · 9bf86f7
1 parent 73dd1d6
commit 9bf86f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}