diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
| commit | cff6bf970965c98c62007fc8a36527fd147fe233 (patch) | |
| tree | 2791f2208b54ade86625af416ff5342f11282f0c /drivers/input/input.c | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/input.c')
| -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 | } |