summaryrefslogtreecommitdiff
path: root/Documentation/input
diff options
context:
space:
mode:
authorMasanari Iida <standby24x7@gmail.com>2012-03-04 23:16:11 +0900
committerJiri Kosina <jkosina@suse.cz>2012-03-07 16:08:24 +0100
commit40e47125e6c5110383b0176d7b9d530f2936b1ae (patch)
tree9653ac1f586cbfe36286c2d987c9330078eb37ad /Documentation/input
parent4e70daaf05a181b6968e29e72e9f1c16a183e92c (diff)
downloadlinux-next-40e47125e6c5110383b0176d7b9d530f2936b1ae.tar.gz
Documentation: Fix multiple typo in Documentation
Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/input')
-rw-r--r--Documentation/input/alps.txt4
-rw-r--r--Documentation/input/joystick.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt
index f274c28b5103..9c407f01d74f 100644
--- a/Documentation/input/alps.txt
+++ b/Documentation/input/alps.txt
@@ -131,8 +131,8 @@ number of contacts (f1 and f0 in the table below).
byte 5: 0 1 ? ? ? ? f1 f0
This packet only appears after a position packet with the mt bit set, and
-ususally only appears when there are two or more contacts (although
-ocassionally it's seen with only a single contact).
+usually only appears when there are two or more contacts (although
+occassionally it's seen with only a single contact).
The final v3 packet type is the trackstick packet.
diff --git a/Documentation/input/joystick.txt b/Documentation/input/joystick.txt
index 8007b7ca87bf..304262bb661a 100644
--- a/Documentation/input/joystick.txt
+++ b/Documentation/input/joystick.txt
@@ -330,7 +330,7 @@ the USB documentation for how to setup an USB mouse.
The TM DirectConnect (BSP) protocol is supported by the tmdc.c
module. This includes, but is not limited to:
-* ThrustMaster Millenium 3D Inceptor
+* ThrustMaster Millennium 3D Interceptor
* ThrustMaster 3D Rage Pad
* ThrustMaster Fusion Digital Game Pad