Merge branch 'xfs-O_TMPFILE-support' into for-next

[karo-tx-linux.git] / drivers / input / keyboard / mpr121_touchkey.c

diff --git a/drivers/input/keyboard/mpr121_touchkey.c b/drivers/input/keyboard/mpr121_touchkey.c
index f7f3e9a9fd3f5c4b63234fd63b750f10b327afb0..009c82256e895ec2383715a2ce706ed75133b0f3 100644 (file)
--- a/drivers/input/keyboard/mpr121_touchkey.c
+++ b/drivers/input/keyboard/mpr121_touchkey.c
@@ -13,7 +13,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/input.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
@@ -188,7 +187,8 @@ err_i2c_write:
 static int mpr_touchkey_probe(struct i2c_client *client,
                              const struct i2c_device_id *id)
 {
-       const struct mpr121_platform_data *pdata = client->dev.platform_data;
+       const struct mpr121_platform_data *pdata =
+                       dev_get_platdata(&client->dev);
        struct mpr121_touchkey *mpr121;
        struct input_dev *input_dev;
        int error;