Merge tag 'drm-intel-fixes-2014-02-11' of ssh://git.freedesktop.org/git/drm-intel...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / input / touchscreen / ad7877.c

diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 69834dd..6793c85 100644 (file)
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -37,7 +37,6 @@
 
 
 #include <linux/device.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
@@ -686,7 +685,7 @@ static int ad7877_probe(struct spi_device *spi)
 {
        struct ad7877                   *ts;
        struct input_dev                *input_dev;
-       struct ad7877_platform_data     *pdata = spi->dev.platform_data;
+       struct ad7877_platform_data     *pdata = dev_get_platdata(&spi->dev);
        int                             err;
        u16                             verify;