diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /drivers/input | |
| parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
| parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) | |
Merge from Linus' tree.
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 88636a204525..14ae5583e198 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -308,6 +308,7 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st | |||
| 308 | MATCH_BIT(ledbit, LED_MAX); | 308 | MATCH_BIT(ledbit, LED_MAX); |
| 309 | MATCH_BIT(sndbit, SND_MAX); | 309 | MATCH_BIT(sndbit, SND_MAX); |
| 310 | MATCH_BIT(ffbit, FF_MAX); | 310 | MATCH_BIT(ffbit, FF_MAX); |
| 311 | MATCH_BIT(swbit, SW_MAX); | ||
| 311 | 312 | ||
| 312 | return id; | 313 | return id; |
| 313 | } | 314 | } |