From 6bd851bfe680be5d96745f05a950f0f5dd86556e Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 27 Aug 2007 23:28:17 +0200
Subject: [PATCH] --- yaml --- r: 69471 b: refs/heads/master c:
 38598105217f65d21b5f5253c5755af9463c9e9a h: refs/heads/master i:   69469:
 ddc752424848a2f7eaa6f14a2a17c43f47b376c4   69467:
 83a3dad55c7f44714108b65620c55fb24d43ead2   69463:
 c3e8f699496e0da7cecabb8e201cebf67c88cb07   69455:
 587dfc1d48385fba7a6fe7d53728f0cb1b1810ae   69439:
 ab9c91a450b781df55a42602b3c5df39727c737f v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/nwfpe/ARM-gcc.h                | 2 +-
 trunk/arch/arm/nwfpe/fpa11.inl                | 8 ++++----
 trunk/include/asm-arm/arch-ixp23xx/platform.h | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 84d350764537..3f9932bd2834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e802dfab7bbbee1e63607a3e6d1ceb78ec4ceeb
+refs/heads/master: 38598105217f65d21b5f5253c5755af9463c9e9a
diff --git a/trunk/arch/arm/nwfpe/ARM-gcc.h b/trunk/arch/arm/nwfpe/ARM-gcc.h
index e6598470b076..436e54aa02ec 100644
--- a/trunk/arch/arm/nwfpe/ARM-gcc.h
+++ b/trunk/arch/arm/nwfpe/ARM-gcc.h
@@ -68,7 +68,7 @@ a compiler does not support explicit inlining, this macro should be defined
 to be `static'.
 -------------------------------------------------------------------------------
 */
-#define INLINE extern __inline__
+#define INLINE static inline
 
 
 /* For use as a GCC soft-float library we need some special function names. */
diff --git a/trunk/arch/arm/nwfpe/fpa11.inl b/trunk/arch/arm/nwfpe/fpa11.inl
index 10c3caf2868f..ab8d6826245f 100644
--- a/trunk/arch/arm/nwfpe/fpa11.inl
+++ b/trunk/arch/arm/nwfpe/fpa11.inl
@@ -22,13 +22,13 @@
 #include "fpa11.h"
 
 /* Read and write floating point status register */
-extern __inline__ unsigned int readFPSR(void)
+static inline unsigned int readFPSR(void)
 {
 	FPA11 *fpa11 = GET_FPA11();
 	return (fpa11->fpsr);
 }
 
-extern __inline__ void writeFPSR(FPSR reg)
+static inline void writeFPSR(FPSR reg)
 {
 	FPA11 *fpa11 = GET_FPA11();
 	/* the sysid byte in the status register is readonly */
@@ -36,14 +36,14 @@ extern __inline__ void writeFPSR(FPSR reg)
 }
 
 /* Read and write floating point control register */
-extern __inline__ FPCR readFPCR(void)
+static inline FPCR readFPCR(void)
 {
 	FPA11 *fpa11 = GET_FPA11();
 	/* clear SB, AB and DA bits before returning FPCR */
 	return (fpa11->fpcr & ~MASK_RFC);
 }
 
-extern __inline__ void writeFPCR(FPCR reg)
+static inline void writeFPCR(FPCR reg)
 {
 	FPA11 *fpa11 = GET_FPA11();
 	fpa11->fpcr &= ~MASK_WFC;		/* clear SB, AB and DA bits */
diff --git a/trunk/include/asm-arm/arch-ixp23xx/platform.h b/trunk/include/asm-arm/arch-ixp23xx/platform.h
index 56e16d66645a..db8aa304c93d 100644
--- a/trunk/include/asm-arm/arch-ixp23xx/platform.h
+++ b/trunk/include/asm-arm/arch-ixp23xx/platform.h
@@ -14,17 +14,17 @@
 
 #ifndef __ASSEMBLY__
 
-extern inline unsigned long ixp2000_reg_read(volatile void *reg)
+static inline unsigned long ixp2000_reg_read(volatile void *reg)
 {
 	return *((volatile unsigned long *)reg);
 }
 
-extern inline void ixp2000_reg_write(volatile void *reg, unsigned long val)
+static inline void ixp2000_reg_write(volatile void *reg, unsigned long val)
 {
 	*((volatile unsigned long *)reg) = val;
 }
 
-extern inline void ixp2000_reg_wrb(volatile void *reg, unsigned long val)
+static inline void ixp2000_reg_wrb(volatile void *reg, unsigned long val)
 {
 	*((volatile unsigned long *)reg) = val;
 }