diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-01 06:25:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-01 06:25:09 +0200 |
| commit | 2161a2a644a6d33a29d68395518d103ed805758f (patch) | |
| tree | 0e28b059ef641b27988c307ce319c1ca6a421a58 /drivers | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | Input: joydev - recognize devices with Z axis as joysticks (diff) | |
| download | linux-2161a2a644a6d33a29d68395518d103ed805758f.tar.xz linux-2161a2a644a6d33a29d68395518d103ed805758f.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fix from Dmitry Torokhov:
"One small change to make joydev (which is used by older games) to bind
to devices that export Z axis but not X or Y (such as TRC rudder)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: joydev - recognize devices with Z axis as joysticks
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/joydev.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 5d11fea3c8ec..f3135ae22df4 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -950,6 +950,12 @@ static const struct input_device_id joydev_ids[] = { .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_ABSBIT, .evbit = { BIT_MASK(EV_ABS) }, + .absbit = { BIT_MASK(ABS_Z) }, + }, + { + .flags = INPUT_DEVICE_ID_MATCH_EVBIT | + INPUT_DEVICE_ID_MATCH_ABSBIT, + .evbit = { BIT_MASK(EV_ABS) }, .absbit = { BIT_MASK(ABS_WHEEL) }, }, { |