--- zzzz-none-000/linux-2.4.17/include/asm-mips/branch.h	2000-05-13 15:31:25.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/include/asm-mips/branch.h	2004-11-24 13:21:33.000000000 +0000
@@ -5,20 +5,18 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996, 1997, 1998 by Ralf Baechle
- *
- * $Id: branch.h,v 1.2 1998/04/28 19:37:46 ralf Exp $
+ * Copyright (C) 1996, 1997, 1998, 2001 by Ralf Baechle
  */
 #include <asm/ptrace.h>
 
-extern inline int delay_slot(struct pt_regs *regs)
+static inline int delay_slot(struct pt_regs *regs)
 {
 	return regs->cp0_cause & CAUSEF_BD;
 }
 
 extern int __compute_return_epc(struct pt_regs *regs);
 
-extern inline int compute_return_epc(struct pt_regs *regs)
+static inline int compute_return_epc(struct pt_regs *regs)
 {
 	if (!delay_slot(regs)) {
 		regs->cp0_epc += 4;