Merge remote-tracking branch 'fbdev/for-next'

[karo-tx-linux.git] / drivers / video / ep93xx-fb.c

diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index 28a837dfddd1cde2974ced029ebd4900de6204b3..35a0f533f1a2c6c73f9e29eb275b7f9ae18ba25d 100644 (file)
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -487,7 +487,7 @@ static void ep93xxfb_dealloc_videomem(struct fb_info *info)
 
 static int ep93xxfb_probe(struct platform_device *pdev)
 {
-       struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data;
+       struct ep93xxfb_mach_info *mach_info = dev_get_platdata(&pdev->dev);
        struct fb_info *info;
        struct ep93xx_fbi *fbi;
        struct resource *res;