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

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

diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
index 47206bdba4113a54db431d581a62b84da93b28ed..e59876212b8c47b42f69973ee7f3f93fdc905694 100644 (file)
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@ -244,7 +244,7 @@ static int ep93xx_keypad_probe(struct platform_device *pdev)
        if (!keypad)
                return -ENOMEM;
 
-       keypad->pdata = pdev->dev.platform_data;
+       keypad->pdata = dev_get_platdata(&pdev->dev);
        if (!keypad->pdata) {
                err = -EINVAL;
                goto failed_free;