[PATCH] ARM: Acornfb: Don't claim IRQ fbcon for cursor

The generic fbcon code tries to register and use the vsync IRQ for
ARM platforms with acornfb, but forgets to disable its own cursor
timer.  The result is a flickering flashing cursor.

Remove the code from the fbcon core to register this platform
private interrupt.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index b209adbd508a96df8285047be74e9b42dea55938..9dd0fbccf9942d4c967b22d0fa4fc17833611f20 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -142,7 +142,6 @@ static int fbcon_set_origin(struct vc_data *);
 #define CURSOR_DRAW_DELAY              (1)
 
 /* # VBL ints between cursor state changes */
-#define ARM_CURSOR_BLINK_RATE          (10)
 #define ATARI_CURSOR_BLINK_RATE                (42)
 #define MAC_CURSOR_BLINK_RATE          (32)
 #define DEFAULT_CURSOR_BLINK_RATE      (20)
@@ -288,7 +287,7 @@ static void fb_flashcursor(void *private)
        release_console_sem();
 }
 
-#if (defined(__arm__) && defined(IRQ_VSYNCPULSE)) || defined(CONFIG_ATARI) || defined(CONFIG_MAC)
+#if defined(CONFIG_ATARI) || defined(CONFIG_MAC)
 static int cursor_blink_rate;
 static irqreturn_t fb_vbl_handler(int irq, void *dev_id, struct pt_regs *fp)
 {
@@ -878,11 +877,6 @@ static const char *fbcon_startup(void)
        }
 #endif                         /* CONFIG_MAC */
 
-#if defined(__arm__) && defined(IRQ_VSYNCPULSE)
-       cursor_blink_rate = ARM_CURSOR_BLINK_RATE;
-       irqres = request_irq(IRQ_VSYNCPULSE, fb_vbl_handler, SA_SHIRQ,
-                            "framebuffer vbl", info);
-#endif
        /* Initialize the work queue. If the driver provides its
         * own work queue this means it will use something besides 
         * default timer to flash the cursor. */