diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 16:34:37 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 16:34:37 -0400 |
| commit | 4ff4258a3e558814a3d48c50a59cd22f56bbea2f (patch) | |
| tree | 35ac4a5d2b162687eef0c38aecf14f3a7c5afee0 /drivers/input/joydev.c | |
| parent | 442d207eb0b4e7047c4fedccd900c425e689d502 (diff) | |
| parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/input/joydev.c')
| -rw-r--r-- | drivers/input/joydev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 7d7527f8b02d..627d343dfba1 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
| @@ -422,7 +422,7 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct | |||
| 422 | joydev->nkey++; | 422 | joydev->nkey++; |
| 423 | } | 423 | } |
| 424 | 424 | ||
| 425 | for (i = 0; i < BTN_JOYSTICK - BTN_MISC + 1; i++) | 425 | for (i = 0; i < BTN_JOYSTICK - BTN_MISC; i++) |
| 426 | if (test_bit(i + BTN_MISC, dev->keybit)) { | 426 | if (test_bit(i + BTN_MISC, dev->keybit)) { |
| 427 | joydev->keymap[i] = joydev->nkey; | 427 | joydev->keymap[i] = joydev->nkey; |
| 428 | joydev->keypam[joydev->nkey] = i + BTN_MISC; | 428 | joydev->keypam[joydev->nkey] = i + BTN_MISC; |