diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 13:51:43 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 13:51:43 -0700 |
| commit | ede2e7cdc58e1847cc73bd26b88a634631a43112 (patch) | |
| tree | f4582f9dc0f4ec8c06975017e036479805d77a4b /drivers/input/mouse/elan_i2c.h | |
| parent | 9768935264c4f0e4afd788a185d8e8d89c28e41d (diff) | |
| parent | 65938133784a3092c61b00aa63d1830fb465c1ac (diff) | |
| download | linux-stable-ede2e7cdc58e1847cc73bd26b88a634631a43112.tar.gz linux-stable-ede2e7cdc58e1847cc73bd26b88a634631a43112.tar.bz2 linux-stable-ede2e7cdc58e1847cc73bd26b88a634631a43112.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.13 merge window.
Diffstat (limited to 'drivers/input/mouse/elan_i2c.h')
| -rw-r--r-- | drivers/input/mouse/elan_i2c.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/elan_i2c.h b/drivers/input/mouse/elan_i2c.h index c0ec26118732..61c202436250 100644 --- a/drivers/input/mouse/elan_i2c.h +++ b/drivers/input/mouse/elan_i2c.h @@ -58,7 +58,7 @@ struct elan_transport_ops { int (*get_version)(struct i2c_client *client, bool iap, u8 *version); int (*get_sm_version)(struct i2c_client *client, - u8* ic_type, u8 *version); + u16 *ic_type, u8 *version); int (*get_checksum)(struct i2c_client *client, bool iap, u16 *csum); int (*get_product_id)(struct i2c_client *client, u16 *id); @@ -82,6 +82,7 @@ struct elan_transport_ops { int (*get_report)(struct i2c_client *client, u8 *report); int (*get_pressure_adjustment)(struct i2c_client *client, int *adjustment); + int (*get_pattern)(struct i2c_client *client, u8 *pattern); }; extern const struct elan_transport_ops elan_smbus_ops, elan_i2c_ops; |