diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
| commit | a2ab67fae1ab9226679495a8d260f4e6555efc5f (patch) | |
| tree | f7de683c9c8ff0869a7e11f1d40802145d05f5b4 /drivers/input/mouse/elantech.h | |
| parent | 6d0485a99366d4e0e7e725f14995c74cb7ca4499 (diff) | |
| parent | 135cad366b4e7d6a79f6369f6cb5b721985aa62f (diff) | |
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'drivers/input/mouse/elantech.h')
| -rw-r--r-- | drivers/input/mouse/elantech.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h index bee282b540bc..ed848cc80814 100644 --- a/drivers/input/mouse/elantech.h +++ b/drivers/input/mouse/elantech.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Elantech Touchpad driver (v5) | 2 | * Elantech Touchpad driver (v6) |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2007-2008 Arjan Opmeer <arjan@opmeer.net> | 4 | * Copyright (C) 2007-2009 Arjan Opmeer <arjan@opmeer.net> |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
| 7 | * under the terms of the GNU General Public License version 2 as published | 7 | * under the terms of the GNU General Public License version 2 as published |
| @@ -104,6 +104,7 @@ struct elantech_data { | |||
| 104 | unsigned char fw_version_min; | 104 | unsigned char fw_version_min; |
| 105 | unsigned char hw_version; | 105 | unsigned char hw_version; |
| 106 | unsigned char paritycheck; | 106 | unsigned char paritycheck; |
| 107 | unsigned char jumpy_cursor; | ||
| 107 | unsigned char parity[256]; | 108 | unsigned char parity[256]; |
| 108 | }; | 109 | }; |
| 109 | 110 | ||