git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
input
/
mouse
/
elantech.h
diff --git
a/drivers/input/mouse/elantech.h
b/drivers/input/mouse/elantech.h
index
feac5f7
..
ac57bde
100644
(file)
--- 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 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 paritycheck;
unsigned char jumpy_cursor;
+ unsigned char hw_version;
+ unsigned int fw_version;
unsigned char parity[256];
};
unsigned char parity[256];
};