diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-17 15:50:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-17 15:50:19 -0800 |
| commit | 03bbe082cffc4533f6557bf23f0c672307067246 (patch) | |
| tree | e2a7e14d96eb0b4a2ef2841defd18267d3c8af10 /drivers/input/mousedev.c | |
| parent | 30472908d50cf726a68c2b444127a1dafae8a91c (diff) | |
| parent | fb49161027e1938c34fc97d1136735e1d4209df6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ALPS - fix sync loss on Acer Aspire 5720ZG
Input: psmouse - fix input_dev leak in lifebook driver
Input: psmouse - fix potential memory leak in psmouse_connect()
Input: usbtouchscreen - fix buffer overflow, make more egalax work
Input: mousedev - handle mice that use absolute coordinates
Diffstat (limited to 'drivers/input/mousedev.c')
| -rw-r--r-- | drivers/input/mousedev.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 78c3ea75da2a..be83516c776c 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -1029,6 +1029,15 @@ static const struct input_device_id mousedev_ids[] = { BIT_MASK(ABS_PRESSURE) | BIT_MASK(ABS_TOOL_WIDTH) }, }, /* A touchpad */ + { + .flags = INPUT_DEVICE_ID_MATCH_EVBIT | + INPUT_DEVICE_ID_MATCH_KEYBIT | + INPUT_DEVICE_ID_MATCH_ABSBIT, + .evbit = { BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_SYN) }, + .keybit = { [BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) }, + .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) }, + }, /* Mouse-like device with absolute X and Y but ordinary + clicks, like hp ILO2 High Performance mouse */ { }, /* Terminating entry */ }; |