summaryrefslogtreecommitdiffstats
path: root/Documentation/joystick-parport.txt
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-08 12:37:17 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-08 12:37:17 +0000
commit9aa9eb41942b918f385ccabd2efdd6e7e4232165 (patch)
tree20bec7da036d31ec185dfc1dcc00753c7ac9b170 /Documentation/joystick-parport.txt
parent87075e049581f880f01eb0b41aa6ac807b299e35 (diff)
Merge with Linux 2.4.0-test6-pre1.
Diffstat (limited to 'Documentation/joystick-parport.txt')
-rw-r--r--Documentation/joystick-parport.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/joystick-parport.txt b/Documentation/joystick-parport.txt
index 0576fc07e..fabfb1f01 100644
--- a/Documentation/joystick-parport.txt
+++ b/Documentation/joystick-parport.txt
@@ -22,7 +22,7 @@ connecting such devices.
2. Devices supported
~~~~~~~~~~~~~~~~~~~~
- Many console and 8-bit coputer gamepads and joysticks are supported. The
+ Many console and 8-bit computer gamepads and joysticks are supported. The
following subsections discuss usage of each.
2.1 NES and SNES
@@ -328,7 +328,7 @@ controllers:
~~~~~~~~
All the Sega controllers are more or less based on the standard 2-button
Multisystem joystick. However, since they don't use switches and use TTL
-logic, the only driver useable with them is the db9.c driver.
+logic, the only driver usable with them is the db9.c driver.
2.4.1 Sega Master System
~~~~~~~~~~~~~~~~~~~~~~~~