diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /drivers/video/console/fbcon.c | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'drivers/video/console/fbcon.c')
| -rw-r--r-- | drivers/video/console/fbcon.c | 4 |
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); |