aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-01 22:32:35 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-01 22:32:35 +0100
commitd533c1289e87cc16b0590077a182f06e4d6ad8aa (patch)
tree9bbb926555483cdc057fa268aa00aa2d9df05fe5
parenta6284acbe429d6afa7746530098ea1b1bbf9f6fe (diff)
downloadkernel_samsung_tuna-d533c1289e87cc16b0590077a182f06e4d6ad8aa.zip
kernel_samsung_tuna-d533c1289e87cc16b0590077a182f06e4d6ad8aa.tar.gz
kernel_samsung_tuna-d533c1289e87cc16b0590077a182f06e4d6ad8aa.tar.bz2
[ARM] 3693/1: ARM: Convert omap1 to generic irq handling
Patch from Thomas Gleixner From: Thomas Gleixner <tglx@linutronix.de> Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-omap1/board-osk.c2
-rw-r--r--arch/arm/mach-omap1/serial.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 1160093..ef7685d 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/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/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 5631974..5615fb8 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/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>