projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream-fixes
[powerpc.git]
/
drivers
/
input
/
joydev.c
diff --git
a/drivers/input/joydev.c
b/drivers/input/joydev.c
index
2b201f9
..
22b2789
100644
(file)
--- a/
drivers/input/joydev.c
+++ b/
drivers/input/joydev.c
@@
-844,8
+844,8
@@
static const struct input_device_id joydev_blacklist[] = {
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
INPUT_DEVICE_ID_MATCH_KEYBIT,
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
INPUT_DEVICE_ID_MATCH_KEYBIT,
- .evbit = { BIT(EV_KEY) },
- .keybit = { [
LONG(BTN_TOUCH)] = BIT
(BTN_TOUCH) },
+ .evbit = { BIT
_MASK
(EV_KEY) },
+ .keybit = { [
BIT_WORD(BTN_TOUCH)] = BIT_MASK
(BTN_TOUCH) },
}, /* Avoid itouchpads, touchscreens and tablets */
{ } /* Terminating entry */
};
}, /* Avoid itouchpads, touchscreens and tablets */
{ } /* Terminating entry */
};
@@
-854,20
+854,20
@@
static const struct input_device_id joydev_ids[] = {
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
INPUT_DEVICE_ID_MATCH_ABSBIT,
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
INPUT_DEVICE_ID_MATCH_ABSBIT,
- .evbit = { BIT(EV_ABS) },
- .absbit = { BIT(ABS_X) },
+ .evbit = { BIT
_MASK
(EV_ABS) },
+ .absbit = { BIT
_MASK
(ABS_X) },
},
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
INPUT_DEVICE_ID_MATCH_ABSBIT,
},
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
INPUT_DEVICE_ID_MATCH_ABSBIT,
- .evbit = { BIT(EV_ABS) },
- .absbit = { BIT(ABS_WHEEL) },
+ .evbit = { BIT
_MASK
(EV_ABS) },
+ .absbit = { BIT
_MASK
(ABS_WHEEL) },
},
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
INPUT_DEVICE_ID_MATCH_ABSBIT,
},
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
INPUT_DEVICE_ID_MATCH_ABSBIT,
- .evbit = { BIT(EV_ABS) },
- .absbit = { BIT(ABS_THROTTLE) },
+ .evbit = { BIT
_MASK
(EV_ABS) },
+ .absbit = { BIT
_MASK
(ABS_THROTTLE) },
},
{ } /* Terminating entry */
};
},
{ } /* Terminating entry */
};