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

[linux-2.6-microblaze.git] / drivers / input / mouse / elan_i2c.h

diff --git a/drivers/input/mouse/elan_i2c.h b/drivers/input/mouse/elan_i2c.h
index e12da5b..3c84dee 100644 (file)
--- a/drivers/input/mouse/elan_i2c.h
+++ b/drivers/input/mouse/elan_i2c.h
@@ -55,6 +55,12 @@
 #define ETP_FW_PAGE_SIZE_512   512
 #define ETP_FW_SIGNATURE_SIZE  6
 
+#define ETP_PRODUCT_ID_WHITEBOX        0x00B8
+#define ETP_PRODUCT_ID_VOXEL   0x00BF
+#define ETP_PRODUCT_ID_DELBIN  0x00C2
+#define ETP_PRODUCT_ID_MAGPIE  0x0120
+#define ETP_PRODUCT_ID_BOBBA   0x0121
+
 struct i2c_client;
 struct completion;
 
@@ -73,7 +79,7 @@ struct elan_transport_ops {
        int (*calibrate_result)(struct i2c_client *client, u8 *val);
 
        int (*get_baseline_data)(struct i2c_client *client,
-                                bool max_baseliune, u8 *value);
+                                bool max_baseline, u8 *value);
 
        int (*get_version)(struct i2c_client *client, u8 pattern, bool iap,
                           u8 *version);