Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into home.osdl.org:/home/torvalds/v2.5/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into home.osdl.org:/home/torvalds/v2.5/linux
80d63a94 · Linus Torvalds · 99438d1e · 291fa700 · 80d63a94
Commit 80d63a94 authored Oct 24, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/video/acornfb.c drivers/video/acornfb.c +1 -1

No files found.
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -1415,7 +1415,7 @@ acornfb_init(void)
 		fb_info.monspecs.vfmin, fb_info.monspecs.vfmax,
 		fb_info.monspecs.dpms ? ", DPMS" : "");

-	if (fb_set_var(&fb_info.var, &fb_info))
+	if (fb_set_var(&fb_info, &fb_info.var))
 		printk(KERN_ERR "Acornfb: unable to set display parameters\n");

 	if (register_framebuffer(&fb_info) < 0)