From 8198d59cdab52079ec10c99f3aa9174a18be52e1 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 11 Sep 2011 13:59:29 +0200
Subject: [PATCH] --- yaml --- r: 267338 b: refs/heads/master c:
 98c2b37353cd8839f86f36e9bb9fe39f33fc9626 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/tty/vt/keyboard.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 16efed9018d5..dbbdba1e7c6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a0db7215c88077b61a673215756ec4a0dc0c7a5
+refs/heads/master: 98c2b37353cd8839f86f36e9bb9fe39f33fc9626
diff --git a/trunk/drivers/tty/vt/keyboard.c b/trunk/drivers/tty/vt/keyboard.c
index 3761ccf0f340..a605549ee28f 100644
--- a/trunk/drivers/tty/vt/keyboard.c
+++ b/trunk/drivers/tty/vt/keyboard.c
@@ -33,7 +33,6 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/irq.h>
 
 #include <linux/kbd_kern.h>
 #include <linux/kbd_diacr.h>
@@ -43,6 +42,8 @@
 #include <linux/notifier.h>
 #include <linux/jiffies.h>
 
+#include <asm/irq_regs.h>
+
 extern void ctrl_alt_del(void);
 
 /*