From a8bd6216eed45718cb7b116aae0c59f1c0956b95 Mon Sep 17 00:00:00 2001
From: "Steven J. Magnani" <steve@digidescorp.com>
Date: Mon, 12 Apr 2010 16:01:36 -0500
Subject: [PATCH] --- yaml --- r: 190658 b: refs/heads/master c:
 e6d7961e5be0a259ba87411370f8be7f7da4c0f6 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/microblaze/kernel/irq.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1e59d55d9120..ec913e332986 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c86fac4382b3fb238a520ab5f2fa200c6a868b7f
+refs/heads/master: e6d7961e5be0a259ba87411370f8be7f7da4c0f6
diff --git a/trunk/arch/microblaze/kernel/irq.c b/trunk/arch/microblaze/kernel/irq.c
index 6f39e2c001f3..8f120aca123d 100644
--- a/trunk/arch/microblaze/kernel/irq.c
+++ b/trunk/arch/microblaze/kernel/irq.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/ftrace.h>
 #include <linux/kernel.h>
 #include <linux/hardirq.h>
 #include <linux/interrupt.h>
@@ -32,7 +33,7 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map);
 
 static u32 concurrent_irq;
 
-void do_IRQ(struct pt_regs *regs)
+void __irq_entry do_IRQ(struct pt_regs *regs)
 {
 	unsigned int irq;
 	struct pt_regs *old_regs = set_irq_regs(regs);