Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 956295d50dc5462722f029de64d44a7ecba54e69

Authored by Al Viro
Committed by Linus Torvalds
1 parent 5932ef0777
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/video/console/fbcon.c
Diff comments   View file @ 956295d
... ... @@ -3197,11 +3197,11 @@
3197 3197 return;
3198 3198  
3199 3199 #ifdef CONFIG_ATARI
3200   - free_irq(IRQ_AUTO_4, fbcon_vbl_handler);
  3200 + free_irq(IRQ_AUTO_4, fb_vbl_handler);
3201 3201 #endif
3202 3202 #ifdef CONFIG_MAC
3203 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 3205 #endif
3206 3206  
3207 3207 kfree((void *)softback_buf);