diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:49:18 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:49:18 -0500 |
commit | ac67c6247361b3b8644b34e5301a46d5069c1373 (patch) | |
tree | dd83147e304181e889eefa39e5056451031f4b5d /drivers/input/joystick/warrior.c | |
parent | [PATCH] sky2: version 0.11 (diff) | |
parent | Linux v2.6.15 (diff) | |
download | linux-dev-ac67c6247361b3b8644b34e5301a46d5069c1373.tar.xz linux-dev-ac67c6247361b3b8644b34e5301a46d5069c1373.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/input/joystick/warrior.c')
-rw-r--r-- | drivers/input/joystick/warrior.c | 2 |
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); |