diff options
Diffstat (limited to 'drivers/input/mousedev.c')
| -rw-r--r-- | drivers/input/mousedev.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 79146d6ed2ab..78c3ea75da2a 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
| @@ -998,34 +998,36 @@ static const struct input_device_id mousedev_ids[] = { | |||
| 998 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | | 998 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | |
| 999 | INPUT_DEVICE_ID_MATCH_KEYBIT | | 999 | INPUT_DEVICE_ID_MATCH_KEYBIT | |
| 1000 | INPUT_DEVICE_ID_MATCH_RELBIT, | 1000 | INPUT_DEVICE_ID_MATCH_RELBIT, |
| 1001 | .evbit = { BIT(EV_KEY) | BIT(EV_REL) }, | 1001 | .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) }, |
| 1002 | .keybit = { [LONG(BTN_LEFT)] = BIT(BTN_LEFT) }, | 1002 | .keybit = { [BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) }, |
| 1003 | .relbit = { BIT(REL_X) | BIT(REL_Y) }, | 1003 | .relbit = { BIT_MASK(REL_X) | BIT_MASK(REL_Y) }, |
| 1004 | }, /* A mouse like device, at least one button, | 1004 | }, /* A mouse like device, at least one button, |
| 1005 | two relative axes */ | 1005 | two relative axes */ |
| 1006 | { | 1006 | { |
| 1007 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | | 1007 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | |
| 1008 | INPUT_DEVICE_ID_MATCH_RELBIT, | 1008 | INPUT_DEVICE_ID_MATCH_RELBIT, |
| 1009 | .evbit = { BIT(EV_KEY) | BIT(EV_REL) }, | 1009 | .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) }, |
| 1010 | .relbit = { BIT(REL_WHEEL) }, | 1010 | .relbit = { BIT_MASK(REL_WHEEL) }, |
| 1011 | }, /* A separate scrollwheel */ | 1011 | }, /* A separate scrollwheel */ |
| 1012 | { | 1012 | { |
| 1013 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | | 1013 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | |
| 1014 | INPUT_DEVICE_ID_MATCH_KEYBIT | | 1014 | INPUT_DEVICE_ID_MATCH_KEYBIT | |
| 1015 | INPUT_DEVICE_ID_MATCH_ABSBIT, | 1015 | INPUT_DEVICE_ID_MATCH_ABSBIT, |
| 1016 | .evbit = { BIT(EV_KEY) | BIT(EV_ABS) }, | 1016 | .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) }, |
| 1017 | .keybit = { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) }, | 1017 | .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, |
| 1018 | .absbit = { BIT(ABS_X) | BIT(ABS_Y) }, | 1018 | .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) }, |
| 1019 | }, /* A tablet like device, at least touch detection, | 1019 | }, /* A tablet like device, at least touch detection, |
| 1020 | two absolute axes */ | 1020 | two absolute axes */ |
| 1021 | { | 1021 | { |
| 1022 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | | 1022 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | |
| 1023 | INPUT_DEVICE_ID_MATCH_KEYBIT | | 1023 | INPUT_DEVICE_ID_MATCH_KEYBIT | |
| 1024 | INPUT_DEVICE_ID_MATCH_ABSBIT, | 1024 | INPUT_DEVICE_ID_MATCH_ABSBIT, |
| 1025 | .evbit = { BIT(EV_KEY) | BIT(EV_ABS) }, | 1025 | .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) }, |
| 1026 | .keybit = { [LONG(BTN_TOOL_FINGER)] = BIT(BTN_TOOL_FINGER) }, | 1026 | .keybit = { [BIT_WORD(BTN_TOOL_FINGER)] = |
| 1027 | .absbit = { BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE) | | 1027 | BIT_MASK(BTN_TOOL_FINGER) }, |
| 1028 | BIT(ABS_TOOL_WIDTH) }, | 1028 | .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) | |
| 1029 | BIT_MASK(ABS_PRESSURE) | | ||
| 1030 | BIT_MASK(ABS_TOOL_WIDTH) }, | ||
| 1029 | }, /* A touchpad */ | 1031 | }, /* A touchpad */ |
| 1030 | 1032 | ||
| 1031 | { }, /* Terminating entry */ | 1033 | { }, /* Terminating entry */ |