diff --git a/[refs] b/[refs] index f18e95e97f0a..1884917a0d9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: feaa61e49b126c2206051a234b8f14ccc75b9f61 +refs/heads/master: f1b9c339bf30c90114b7c8f285d25e67c7080f90 diff --git a/trunk/drivers/video/w100fb.c b/trunk/drivers/video/w100fb.c index 8a141c2c637b..2376f688ec8b 100644 --- a/trunk/drivers/video/w100fb.c +++ b/trunk/drivers/video/w100fb.c @@ -748,8 +748,6 @@ int __init w100fb_probe(struct platform_device *pdev) goto out; } - w100fb_set_par(info); - if (register_framebuffer(info) < 0) { err = -EINVAL; goto out;