From 27388da48d18a60619c6aded50443ee26247a707 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 28 Jan 2010 15:21:42 +0100
Subject: [PATCH] --- yaml --- r: 182088 b: refs/heads/master c:
 2d1b6e95515d63030b6e002125799f2aa52a9d27 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 46f0bcbfbfaa..7ac631beb098 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3482d713a91befb8c96722cb8d55aed36c212d9e
+refs/heads/master: 2d1b6e95515d63030b6e002125799f2aa52a9d27
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
index 31b204b26ba0..b417e2727050 100644
--- a/trunk/arch/mips/kernel/traps.c
+++ b/trunk/arch/mips/kernel/traps.c
@@ -1276,7 +1276,7 @@ unsigned long vi_handlers[64];
  * to interrupt handlers in the address range from
  * KSEG0 <= x < KSEG0 + 256mb on the Nevada.  Oh well ...
  */
-void *set_except_vector(int n, void *addr)
+void __init *set_except_vector(int n, void *addr)
 {
 	unsigned long handler = (unsigned long) addr;
 	unsigned long old_handler = exception_handlers[n];