From c84161b28126d096eea545e0fbfe9ac84a0b83a3 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 1 Jul 2006 22:32:38 +0100
Subject: [PATCH] --- yaml --- r: 31727 b: refs/heads/master c:
 119c641c9e665718f080ccde3422dd97259e0fc8 h: refs/heads/master i:   31725:
 edc5aaddfaa462de614d6ae3d254bd70b35124d7   31723:
 c5bbf7aeb72384bf1357006b5e95a6f6a472121f   31719:
 5e2345f7600cddf3113adeab897d060022c14639   31711:
 a87f16658700e61174d2d4268b19f3e833ff1f94 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-sa1100/cerf.c  | 1 +
 trunk/arch/arm/mach-sa1100/h3600.c | 2 +-
 trunk/arch/arm/mach-sa1100/irq.c   | 3 ++-
 trunk/arch/arm/mach-sa1100/pleb.c  | 1 +
 trunk/arch/arm/mach-sa1100/time.c  | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index eb34c5f3ee3c..de536abd7520 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a67b777bc4dd1d02c1381ba07e9965cfa9346e8
+refs/heads/master: 119c641c9e665718f080ccde3422dd97259e0fc8
diff --git a/trunk/arch/arm/mach-sa1100/cerf.c b/trunk/arch/arm/mach-sa1100/cerf.c
index e0f6d57b5065..31afe50d7cd5 100644
--- a/trunk/arch/arm/mach-sa1100/cerf.c
+++ b/trunk/arch/arm/mach-sa1100/cerf.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/platform_device.h>
+#include <linux/irq.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/trunk/arch/arm/mach-sa1100/h3600.c b/trunk/arch/arm/mach-sa1100/h3600.c
index e727ba87b9f2..e10d661c015f 100644
--- a/trunk/arch/arm/mach-sa1100/h3600.c
+++ b/trunk/arch/arm/mach-sa1100/h3600.c
@@ -835,7 +835,7 @@ static void __init h3800_init_irq(void)
 	}
 #endif
 	set_irq_type(IRQ_GPIO_H3800_ASIC, IRQT_RISING);
-	set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, &h3800_IRQ_demux);
+	set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux);
 }
 
 
diff --git a/trunk/arch/arm/mach-sa1100/irq.c b/trunk/arch/arm/mach-sa1100/irq.c
index b3a56024182e..2891b8ca86dd 100644
--- a/trunk/arch/arm/mach-sa1100/irq.c
+++ b/trunk/arch/arm/mach-sa1100/irq.c
@@ -11,12 +11,13 @@
  */
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/ioport.h>
 #include <linux/ptrace.h>
 #include <linux/sysdev.h>
 
 #include <asm/hardware.h>
-#include <asm/irq.h>
 #include <asm/mach/irq.h>
 
 #include "generic.h"
diff --git a/trunk/arch/arm/mach-sa1100/pleb.c b/trunk/arch/arm/mach-sa1100/pleb.c
index 0709ebab531c..c7bf7e0038f0 100644
--- a/trunk/arch/arm/mach-sa1100/pleb.c
+++ b/trunk/arch/arm/mach-sa1100/pleb.c
@@ -7,6 +7,7 @@
 #include <linux/tty.h>
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
+#include <linux/irq.h>
 
 #include <linux/mtd/partitions.h>
 
diff --git a/trunk/arch/arm/mach-sa1100/time.c b/trunk/arch/arm/mach-sa1100/time.c
index e4b435e634e4..688b1e109a40 100644
--- a/trunk/arch/arm/mach-sa1100/time.c
+++ b/trunk/arch/arm/mach-sa1100/time.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/timex.h>
 #include <linux/signal.h>