]> err.no Git - linux-2.6/commitdiff
[PATCH] w100fb: platform device conversion fixup
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 14 Nov 2005 00:06:38 +0000 (16:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 14 Nov 2005 02:14:11 +0000 (18:14 -0800)
Fix an error in w100fb after the platform device conversion.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/video/w100fb.c

index daa46051f55df8ea5b77f2c5245d677e0ed5c179..f6e24ee85f077db2e0f6d3021aef12a652f6e383 100644 (file)
@@ -514,7 +514,7 @@ int __init w100fb_probe(struct platform_device *pdev)
        if (remapped_fbuf == NULL)
                goto out;
 
-       info=framebuffer_alloc(sizeof(struct w100fb_par), dev);
+       info=framebuffer_alloc(sizeof(struct w100fb_par), &pdev->dev);
        if (!info) {
                err = -ENOMEM;
                goto out;