Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6-omap-h63xx.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 63a2564f0f818315ec06d94aa3e1c3c1b90a7470..7e67dcb3d4f657d4bab800b8390b4af976b4554d 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -253,7 +253,7 @@ config GREENASIA_FF
        select INPUT_FF_MEMLESS
        ---help---
        Say Y here if you have a GreenAsia (Product ID 0x12) based game controller
-       (like MANTA Warior MM816 and SpeedLink Strike2 SL-6635) or adapter
+       (like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter
        and want to enable force feedback support for it.
 
 config HID_TOPSEED