Merge tag 'dmaengine-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw...

[firefly-linux-kernel-4.4.55.git] / Documentation / input / joystick.txt

diff --git a/Documentation/input/joystick.txt b/Documentation/input/joystick.txt
index 8007b7ca87bf751a06b800967c493e90092d3324..304262bb661a87b7e55631c18082f8462b9d859a 100644 (file)
--- 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