From c5bbf7aeb72384bf1357006b5e95a6f6a472121f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 1 Jul 2006 22:32:35 +0100
Subject: [PATCH] --- yaml --- r: 31723 b: refs/heads/master c:
 d533c1289e87cc16b0590077a182f06e4d6ad8aa h: refs/heads/master i:   31721:
 29e74d08767713e49444e63dc57e888d090f3347   31719:
 5e2345f7600cddf3113adeab897d060022c14639 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/mach-omap1/board-osk.c | 2 +-
 trunk/arch/arm/mach-omap1/serial.c    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 866a197b003a..6ff1332e021d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6284acbe429d6afa7746530098ea1b1bbf9f6fe
+refs/heads/master: d533c1289e87cc16b0590077a182f06e4d6ad8aa
diff --git a/trunk/arch/arm/mach-omap1/board-osk.c b/trunk/arch/arm/mach-omap1/board-osk.c
index 1160093e8ef6..ef7685d224d5 100644
--- a/trunk/arch/arm/mach-omap1/board-osk.c
+++ b/trunk/arch/arm/mach-omap1/board-osk.c
@@ -29,7 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/trunk/arch/arm/mach-omap1/serial.c b/trunk/arch/arm/mach-omap1/serial.c
index 56319742aa1b..5615fb8a3d5b 100644
--- a/trunk/arch/arm/mach-omap1/serial.c
+++ b/trunk/arch/arm/mach-omap1/serial.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/serial.h>
 #include <linux/tty.h>