summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-11-14 01:06:38 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-14 03:14:11 +0100
commitafdd3b3c8ee63c662bafc9194c182610b254c59b (patch)
tree727bdffb6e06ac0af28219d78c6f5e0a020962e9 /drivers/video
parent[PATCH] packet writing oops fix (diff)
downloadlinux-afdd3b3c8ee63c662bafc9194c182610b254c59b.tar.xz
linux-afdd3b3c8ee63c662bafc9194c182610b254c59b.zip
[PATCH] w100fb: platform device conversion fixup
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/w100fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index daa46051f55d..f6e24ee85f07 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -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;