summaryrefslogtreecommitdiff
path: root/drivers/input/joystick/warrior.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-03 16:03:07 -0500
committerLen Brown <len.brown@intel.com>2006-01-03 16:03:07 -0500
commitd78fef14c2218ba9666687aabc57392c54569048 (patch)
tree273c138af78d03b65ac609aea44917e40f54f0ce /drivers/input/joystick/warrior.c
parent04348e69e7e78ad69a09b2e1157f628d6c764370 (diff)
parent88026842b0a760145aa71d69e74fbc9ec118ca44 (diff)
Pull linus into release branch
Diffstat (limited to 'drivers/input/joystick/warrior.c')
-rw-r--r--drivers/input/joystick/warrior.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 99a642d2a1fe..1849b176cf18 100644
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -172,7 +172,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
input_set_abs_params(input_dev, ABS_Y, -64, 64, 0, 8);
input_set_abs_params(input_dev, ABS_THROTTLE, -112, 112, 0, 0);
input_set_abs_params(input_dev, ABS_HAT0X, -1, 1, 0, 0);
- input_set_abs_params(input_dev, ABS_HAT0X, -1, 1, 0, 0);
+ input_set_abs_params(input_dev, ABS_HAT0Y, -1, 1, 0, 0);
serio_set_drvdata(serio, warrior);