diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2010-07-04 04:21:25 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-07-04 04:23:26 -0400 |
commit | 312e8e8a9e2471b0ada7366497fffb3ff1a40e2c (patch) | |
tree | 45f91b8099e5fbcebfcb3a208902013a4bb9fb0c /drivers/input/touchscreen | |
parent | 866d7d7b4a4e1d502b136bcc8af605091fe4c7b5 (diff) |
Input: mcs - Add MCS touchkey driver
This adds support for MELPAS MCS5000/MSC5080 touch key controllers.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/mcs5000_ts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c index 1fb0c2f06a4..6ee9940aaf5 100644 --- a/drivers/input/touchscreen/mcs5000_ts.c +++ b/drivers/input/touchscreen/mcs5000_ts.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
19 | #include <linux/i2c/mcs5000_ts.h> | 19 | #include <linux/i2c/mcs.h> |
20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
21 | #include <linux/input.h> | 21 | #include <linux/input.h> |
22 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
@@ -105,7 +105,7 @@ enum mcs5000_ts_read_offset { | |||
105 | struct mcs5000_ts_data { | 105 | struct mcs5000_ts_data { |
106 | struct i2c_client *client; | 106 | struct i2c_client *client; |
107 | struct input_dev *input_dev; | 107 | struct input_dev *input_dev; |
108 | const struct mcs5000_ts_platform_data *platform_data; | 108 | const struct mcs_platform_data *platform_data; |
109 | }; | 109 | }; |
110 | 110 | ||
111 | static irqreturn_t mcs5000_ts_interrupt(int irq, void *dev_id) | 111 | static irqreturn_t mcs5000_ts_interrupt(int irq, void *dev_id) |
@@ -164,7 +164,7 @@ static irqreturn_t mcs5000_ts_interrupt(int irq, void *dev_id) | |||
164 | 164 | ||
165 | static void mcs5000_ts_phys_init(struct mcs5000_ts_data *data) | 165 | static void mcs5000_ts_phys_init(struct mcs5000_ts_data *data) |
166 | { | 166 | { |
167 | const struct mcs5000_ts_platform_data *platform_data = | 167 | const struct mcs_platform_data *platform_data = |
168 | data->platform_data; | 168 | data->platform_data; |
169 | struct i2c_client *client = data->client; | 169 | struct i2c_client *client = data->client; |
170 | 170 | ||