From 319725483180db9c39f88c46e4f40ffb2fcba5ca Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 1 Dec 2006 12:53:18 +0100
Subject: [PATCH] --- yaml --- r: 42320 b: refs/heads/master c:
 4cfbdfff70989a0d99b6f357fbbe379c22a05f7c h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-powerpc/io.h      | 4 ++--
 trunk/include/asm-powerpc/tsi108.h  | 4 ++--
 trunk/include/asm-powerpc/uaccess.h | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 03ab99eaa500..5b3def30d0db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28f9ec349ae47c91768b7bc5607db4442c818e11
+refs/heads/master: 4cfbdfff70989a0d99b6f357fbbe379c22a05f7c
diff --git a/trunk/include/asm-powerpc/io.h b/trunk/include/asm-powerpc/io.h
index 75df3bce9ccb..1cd532379c30 100644
--- a/trunk/include/asm-powerpc/io.h
+++ b/trunk/include/asm-powerpc/io.h
@@ -302,7 +302,7 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
 #ifdef CONFIG_PPC32
 
 #define __do_in_asm(name, op)				\
-extern __inline__ unsigned int name(unsigned int port)	\
+static inline unsigned int name(unsigned int port)	\
 {							\
 	unsigned int x;					\
 	__asm__ __volatile__(				\
@@ -329,7 +329,7 @@ extern __inline__ unsigned int name(unsigned int port)	\
 }
 
 #define __do_out_asm(name, op)				\
-extern __inline__ void name(unsigned int val, unsigned int port) \
+static inline void name(unsigned int val, unsigned int port) \
 {							\
 	__asm__ __volatile__(				\
 		"sync\n"				\
diff --git a/trunk/include/asm-powerpc/tsi108.h b/trunk/include/asm-powerpc/tsi108.h
index 2c702d35a7cf..4e95d153be84 100644
--- a/trunk/include/asm-powerpc/tsi108.h
+++ b/trunk/include/asm-powerpc/tsi108.h
@@ -98,12 +98,12 @@ typedef struct {
 extern u32 get_vir_csrbase(void);
 extern u32 tsi108_csr_vir_base;
 
-extern inline u32 tsi108_read_reg(u32 reg_offset)
+static inline u32 tsi108_read_reg(u32 reg_offset)
 {
 	return in_be32((volatile u32 *)(tsi108_csr_vir_base + reg_offset));
 }
 
-extern inline void tsi108_write_reg(u32 reg_offset, u32 val)
+static inline void tsi108_write_reg(u32 reg_offset, u32 val)
 {
 	out_be32((volatile u32 *)(tsi108_csr_vir_base + reg_offset), val);
 }
diff --git a/trunk/include/asm-powerpc/uaccess.h b/trunk/include/asm-powerpc/uaccess.h
index d83fc29c2bbf..adbf16b8cfbb 100644
--- a/trunk/include/asm-powerpc/uaccess.h
+++ b/trunk/include/asm-powerpc/uaccess.h
@@ -304,7 +304,7 @@ extern unsigned long __copy_tofrom_user(void __user *to,
 
 #ifndef __powerpc64__
 
-extern inline unsigned long copy_from_user(void *to,
+static inline unsigned long copy_from_user(void *to,
 		const void __user *from, unsigned long n)
 {
 	unsigned long over;
@@ -319,7 +319,7 @@ extern inline unsigned long copy_from_user(void *to,
 	return n;
 }
 
-extern inline unsigned long copy_to_user(void __user *to,
+static inline unsigned long copy_to_user(void __user *to,
 		const void *from, unsigned long n)
 {
 	unsigned long over;