From 27a91bba4f4a2cb25424d3cee70d8e181fe83cdb Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 18 Nov 2008 20:45:23 +0100
Subject: [PATCH] --- yaml --- r: 122962 b: refs/heads/master c:
 7f877ebb32ac9a4b0783e825cef84c6ace87fe90 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/console/fbcon.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 27d8f1f06f2a..a2b28a78d2ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79f0c9a0479060e3a8607d93bc8d81ff962acc87
+refs/heads/master: 7f877ebb32ac9a4b0783e825cef84c6ace87fe90
diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c
index e99bb7c51798..4bcff81b50e0 100644
--- a/trunk/drivers/video/console/fbcon.c
+++ b/trunk/drivers/video/console/fbcon.c
@@ -3455,7 +3455,8 @@ static void fbcon_exit(void)
 		return;
 
 #ifdef CONFIG_ATARI
-	free_irq(IRQ_AUTO_4, fb_vbl_handler);
+	if (MACH_IS_ATARI)
+		free_irq(IRQ_AUTO_4, fb_vbl_handler);
 #endif
 
 	kfree((void *)softback_buf);