Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-block.git] / drivers / input / mouse / elantech.h

diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index 12ba5af931453d1ccfeba36fb0056dc845099de4..46343998522b047cfa9b0e531a935a1dc5a0ace2 100644 (file)
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -141,8 +141,15 @@ struct elantech_device_info {
        unsigned char debug;
        unsigned char hw_version;
        unsigned int fw_version;
+       unsigned int x_min;
+       unsigned int y_min;
+       unsigned int x_max;
+       unsigned int y_max;
        unsigned int x_res;
        unsigned int y_res;
+       unsigned int x_traces;
+       unsigned int y_traces;
+       unsigned int width;
        unsigned int bus;
        bool paritycheck;
        bool jumpy_cursor;
@@ -150,6 +157,7 @@ struct elantech_device_info {
        bool crc_enabled;
        bool set_hw_resolution;
        bool has_trackpoint;
+       bool has_middle_button;
        int (*send_cmd)(struct psmouse *psmouse, unsigned char c,
                        unsigned char *param);
 };