diff --git a/[refs] b/[refs]
index 4d4301944ff1..e9958534ff83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fd11a2173709cd598345e15382af480979cf4fc
+refs/heads/master: b4d05cb9cbbf206ab0dc2c1740938b87b3d3ee44
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
index bed0eb6cf55d..4efe3f2eba63 100644
--- a/trunk/arch/mips/kernel/traps.c
+++ b/trunk/arch/mips/kernel/traps.c
@@ -1019,7 +1019,7 @@ void mips_srs_free (int set)
 	spin_unlock_irqrestore(&sr->sr_lock, flags);
 }
 
-void *set_vi_srs_handler (int n, void *addr, int srs)
+static void *set_vi_srs_handler(int n, void *addr, int srs)
 {
 	unsigned long handler;
 	unsigned long old_handler = vi_handlers[n];
diff --git a/trunk/include/asm-mips/system.h b/trunk/include/asm-mips/system.h
index 4097fac5ac3c..29c55e7ab311 100644
--- a/trunk/include/asm-mips/system.h
+++ b/trunk/include/asm-mips/system.h
@@ -440,7 +440,6 @@ static inline unsigned long __cmpxchg(volatile void * ptr, unsigned long old,
 extern void set_handler (unsigned long offset, void *addr, unsigned long len);
 extern void set_uncached_handler (unsigned long offset, void *addr, unsigned long len);
 extern void *set_vi_handler (int n, void *addr);
-extern void *set_vi_srs_handler (int n, void *addr, int regset);
 extern void *set_except_vector(int n, void *addr);
 extern void per_cpu_trap_init(void);