From a25997c4a1b4a6be85425766d268211d4bcc4afe Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 8 Jan 2009 15:42:41 +0000
Subject: [PATCH] --- yaml --- r: 127754 b: refs/heads/master c:
 39ebfd3f0d58a89f29097f99a1de50c096375ee2 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/mach-footbridge/common.c  | 2 --
 trunk/arch/arm/mach-footbridge/common.h  | 1 +
 trunk/arch/arm/mach-footbridge/isa-irq.c | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 713be9f3567a..817d33c3ab53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87e0d6cca16a7c9ec446d82a465077a0f99171de
+refs/heads/master: 39ebfd3f0d58a89f29097f99a1de50c096375ee2
diff --git a/trunk/arch/arm/mach-footbridge/common.c b/trunk/arch/arm/mach-footbridge/common.c
index 36ff06d4df15..aad270b76311 100644
--- a/trunk/arch/arm/mach-footbridge/common.c
+++ b/trunk/arch/arm/mach-footbridge/common.c
@@ -28,8 +28,6 @@
 
 #include "common.h"
 
-extern void __init isa_init_irq(unsigned int irq);
-
 unsigned int mem_fclk_21285 = 50000000;
 
 EXPORT_SYMBOL(mem_fclk_21285);
diff --git a/trunk/arch/arm/mach-footbridge/common.h b/trunk/arch/arm/mach-footbridge/common.h
index 580e31bbc711..b05e662d21ad 100644
--- a/trunk/arch/arm/mach-footbridge/common.h
+++ b/trunk/arch/arm/mach-footbridge/common.h
@@ -7,3 +7,4 @@ extern void isa_rtc_init(void);
 extern void footbridge_map_io(void);
 extern void footbridge_init_irq(void);
 
+extern void isa_init_irq(unsigned int irq);
diff --git a/trunk/arch/arm/mach-footbridge/isa-irq.c b/trunk/arch/arm/mach-footbridge/isa-irq.c
index 9ee80a211d3c..8bfd06aeb64d 100644
--- a/trunk/arch/arm/mach-footbridge/isa-irq.c
+++ b/trunk/arch/arm/mach-footbridge/isa-irq.c
@@ -28,6 +28,8 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
+#include "common.h"
+
 static void isa_mask_pic_lo_irq(unsigned int irq)
 {
 	unsigned int mask = 1 << (irq & 7);