Merge branch 'master' into upstream

[pandora-kernel.git] / drivers / video / s3c2410fb.c

diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index ccef56d..ed34260 100644 (file)
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -791,6 +791,8 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
 
        info = fbinfo->par;
        info->fb = fbinfo;
+       info->dev = &pdev->dev;
+
        platform_set_drvdata(pdev, fbinfo);
 
        dprintk("devinit\n");