]> err.no Git - linux-2.6/commitdiff
[PATCH] fix the survivors of fbcon_vbl_handler() renaming
authorAl Viro <viro@ftp.linux.org.uk>
Sat, 23 Sep 2006 00:27:30 +0000 (01:27 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 23 Sep 2006 00:48:57 +0000 (17:48 -0700)
In

|Author: James Simmons <jsimmons@kozmo.(none)>
|Date:   Thu Mar 13 22:37:08 2003 -0800
|
|    [FBCON] Cursor handling clean up. I nuked several static variables.

we have

-static void fbcon_vbl_handler(int irq, void *dummy, struct pt_regs *fp)
+static void fb_vbl_handler(int irq, void *dev_id, struct pt_regs *fp)

and 3 years later a couple of instances missed back then still remains
there.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/video/console/fbcon.c

index 390439b3d899e54ea31fb96bd21cd3128ac85bff..1b4f75d1f8a949bb3321733d0aa5e61fe7bdf04f 100644 (file)
@@ -3197,11 +3197,11 @@ static void fbcon_exit(void)
                return;
 
 #ifdef CONFIG_ATARI
-       free_irq(IRQ_AUTO_4, fbcon_vbl_handler);
+       free_irq(IRQ_AUTO_4, fb_vbl_handler);
 #endif
 #ifdef CONFIG_MAC
        if (MACH_IS_MAC && vbl_detected)
-               free_irq(IRQ_MAC_VBL, fbcon_vbl_handler);
+               free_irq(IRQ_MAC_VBL, fb_vbl_handler);
 #endif
 
        kfree((void *)softback_buf);