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

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

diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c
index 7c236f9c6a519f1baf7f36f44599dd96fc82820c..1da8e0b44b563252350ab2c21b085c4442969de9 100644 (file)
--- a/drivers/input/keyboard/mcs_touchkey.c
+++ b/drivers/input/keyboard/mcs_touchkey.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/i2c/mcs.h>
 #include <linux/interrupt.h>
@@ -108,7 +107,7 @@ static int mcs_touchkey_probe(struct i2c_client *client,
        int error;
        int i;
 
-       pdata = client->dev.platform_data;
+       pdata = dev_get_platdata(&client->dev);
        if (!pdata) {
                dev_err(&client->dev, "no platform data defined\n");
                return -EINVAL;