diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 10:58:01 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 10:58:01 +0200 |
| commit | 4894e4aca82aca927d0404ce61f021f790de4b1e (patch) | |
| tree | bbe0d083829f5858295298f188d885367cf4b1f6 /drivers/input/joydev.c | |
| parent | Input: appletouch - improve finger detection (diff) | |
| parent | Linux 2.6.30 (diff) | |
| download | linux-4894e4aca82aca927d0404ce61f021f790de4b1e.tar.xz linux-4894e4aca82aca927d0404ce61f021f790de4b1e.zip | |
Merge commit 'v2.6.30' into next
Diffstat (limited to 'drivers/input/joydev.c')
| -rw-r--r-- | drivers/input/joydev.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 15bb41195bea..0e12f89276a3 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -843,7 +843,13 @@ static const struct input_device_id joydev_blacklist[] = { INPUT_DEVICE_ID_MATCH_KEYBIT, .evbit = { BIT_MASK(EV_KEY) }, .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, - }, /* Avoid itouchpads, touchscreens and tablets */ + }, /* Avoid itouchpads and touchscreens */ + { + .flags = INPUT_DEVICE_ID_MATCH_EVBIT | + INPUT_DEVICE_ID_MATCH_KEYBIT, + .evbit = { BIT_MASK(EV_KEY) }, + .keybit = { [BIT_WORD(BTN_DIGI)] = BIT_MASK(BTN_DIGI) }, + }, /* Avoid tablets, digitisers and similar devices */ { } /* Terminating entry */ }; |