diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 10:12:41 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 10:12:41 -0700 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /drivers/input/mouse/elantech.h | |
| parent | Input: add keypad driver for keys interfaced to TCA6416 (diff) | |
| parent | Linus 2.6.34 (diff) | |
| download | linux-dev-8d0bc2b456103a34c11e01305cd1aed1cde579e5.tar.xz linux-dev-8d0bc2b456103a34c11e01305cd1aed1cde579e5.zip | |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'drivers/input/mouse/elantech.h')
| -rw-r--r-- | drivers/input/mouse/elantech.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h index feac5f7af966..ac57bde1bb9f 100644 --- a/drivers/input/mouse/elantech.h +++ b/drivers/input/mouse/elantech.h @@ -100,11 +100,10 @@ struct elantech_data { unsigned char reg_26; unsigned char debug; unsigned char capabilities; - unsigned char fw_version_maj; - unsigned char fw_version_min; - unsigned char hw_version; unsigned char paritycheck; unsigned char jumpy_cursor; + unsigned char hw_version; + unsigned int fw_version; unsigned char parity[256]; }; |