Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes

[~andy/linux] / drivers / input / mouse / gpio_mouse.c

diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index 6b44413f54e357cd9201af5dc011bed845e1377d..8c7d94200bdbd5a83258ef25542cc5130cc4dc4a 100644 (file)
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -8,7 +8,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/input-polldev.h>
@@ -48,7 +47,7 @@ static void gpio_mouse_scan(struct input_polled_dev *dev)
 
 static int gpio_mouse_probe(struct platform_device *pdev)
 {
-       struct gpio_mouse_platform_data *pdata = pdev->dev.platform_data;
+       struct gpio_mouse_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct input_polled_dev *input_poll;
        struct input_dev *input;
        int pin, i;