diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-16 23:09:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-16 23:09:34 +0200 |
| commit | 300a103d1504134f8c4a7e831f995e917ea9b1e4 (patch) | |
| tree | 7f94d5fff513d132bd0b57a9e3bd96c4cc80d707 /drivers/input/joystick/amijoy.c | |
| parent | sparc: Really fix "console=" for serial consoles. (diff) | |
| parent | Linux 2.6.36-rc1 (diff) | |
| download | linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.tar.xz linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/joystick/amijoy.c')
| -rw-r--r-- | drivers/input/joystick/amijoy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c index 05022f07ec77..0bc86204213e 100644 --- a/drivers/input/joystick/amijoy.c +++ b/drivers/input/joystick/amijoy.c @@ -139,8 +139,8 @@ static int __init amijoy_init(void) amijoy_dev[i]->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT); for (j = 0; j < 2; j++) { - amijoy_dev[i]->absmin[ABS_X + j] = -1; - amijoy_dev[i]->absmax[ABS_X + j] = 1; + input_set_abs_params(amijoy_dev[i], ABS_X + j, + -1, 1, 0, 0); } err = input_register_device(amijoy_dev[i]); |