diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
| commit | 4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch) | |
| tree | 2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /include/linux/mod_devicetable.h | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | b8d055a878ee0f997ded40649701089d2486f850 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index c4db5827963d..0dddfa44ec19 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -274,7 +274,7 @@ struct pcmcia_device_id { | |||
| 274 | /* Input */ | 274 | /* Input */ |
| 275 | #define INPUT_DEVICE_ID_EV_MAX 0x1f | 275 | #define INPUT_DEVICE_ID_EV_MAX 0x1f |
| 276 | #define INPUT_DEVICE_ID_KEY_MIN_INTERESTING 0x71 | 276 | #define INPUT_DEVICE_ID_KEY_MIN_INTERESTING 0x71 |
| 277 | #define INPUT_DEVICE_ID_KEY_MAX 0x1ff | 277 | #define INPUT_DEVICE_ID_KEY_MAX 0x2ff |
| 278 | #define INPUT_DEVICE_ID_REL_MAX 0x0f | 278 | #define INPUT_DEVICE_ID_REL_MAX 0x0f |
| 279 | #define INPUT_DEVICE_ID_ABS_MAX 0x3f | 279 | #define INPUT_DEVICE_ID_ABS_MAX 0x3f |
| 280 | #define INPUT_DEVICE_ID_MSC_MAX 0x07 | 280 | #define INPUT_DEVICE_ID_MSC_MAX 0x07 |