diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-26 00:14:19 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-26 00:14:19 -0400 |
| commit | ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 (patch) | |
| tree | acf9620d1f4900568edbc4a645ad5bb435147195 /drivers/input/input.c | |
| parent | 77426d7210430b70a7f5b21c05c4e7505528937d (diff) | |
Input: move input_device_id to mod_devicetable.h
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index a935abeffffc..591c70d80cd8 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -286,19 +286,19 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st | |||
| 286 | for (; id->flags || id->driver_info; id++) { | 286 | for (; id->flags || id->driver_info; id++) { |
| 287 | 287 | ||
| 288 | if (id->flags & INPUT_DEVICE_ID_MATCH_BUS) | 288 | if (id->flags & INPUT_DEVICE_ID_MATCH_BUS) |
| 289 | if (id->id.bustype != dev->id.bustype) | 289 | if (id->bustype != dev->id.bustype) |
| 290 | continue; | 290 | continue; |
| 291 | 291 | ||
| 292 | if (id->flags & INPUT_DEVICE_ID_MATCH_VENDOR) | 292 | if (id->flags & INPUT_DEVICE_ID_MATCH_VENDOR) |
| 293 | if (id->id.vendor != dev->id.vendor) | 293 | if (id->vendor != dev->id.vendor) |
| 294 | continue; | 294 | continue; |
| 295 | 295 | ||
| 296 | if (id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT) | 296 | if (id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT) |
| 297 | if (id->id.product != dev->id.product) | 297 | if (id->product != dev->id.product) |
| 298 | continue; | 298 | continue; |
| 299 | 299 | ||
| 300 | if (id->flags & INPUT_DEVICE_ID_MATCH_VERSION) | 300 | if (id->flags & INPUT_DEVICE_ID_MATCH_VERSION) |
| 301 | if (id->id.version != dev->id.version) | 301 | if (id->version != dev->id.version) |
| 302 | continue; | 302 | continue; |
| 303 | 303 | ||
| 304 | MATCH_BIT(evbit, EV_MAX); | 304 | MATCH_BIT(evbit, EV_MAX); |