aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-09-22 20:27:30 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 20:48:57 -0400
commit956295d50dc5462722f029de64d44a7ecba54e69 (patch)
tree839ebe5631d59e702db05e37b506af446f4615e9
parent5932ef077716e3e798eaba6738ef874849f62a17 (diff)
[PATCH] fix the survivors of fbcon_vbl_handler() renaming
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>
-rw-r--r--drivers/video/console/fbcon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 390439b3d899..1b4f75d1f8a9 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -3197,11 +3197,11 @@ static void fbcon_exit(void)
3197 return; 3197 return;
3198 3198
3199#ifdef CONFIG_ATARI 3199#ifdef CONFIG_ATARI
3200 free_irq(IRQ_AUTO_4, fbcon_vbl_handler); 3200 free_irq(IRQ_AUTO_4, fb_vbl_handler);
3201#endif 3201#endif
3202#ifdef CONFIG_MAC 3202#ifdef CONFIG_MAC
3203 if (MACH_IS_MAC && vbl_detected) 3203 if (MACH_IS_MAC && vbl_detected)
3204 free_irq(IRQ_MAC_VBL, fbcon_vbl_handler); 3204 free_irq(IRQ_MAC_VBL, fb_vbl_handler);
3205#endif 3205#endif
3206 3206
3207 kfree((void *)softback_buf); 3207 kfree((void *)softback_buf);