Merge git://git.infradead.org/embedded-2.6

[linux-2.6-omap-h63xx.git] / include / asm-cris / arch-v10 / system.h

diff --git a/include/asm-cris/arch-v10/system.h b/include/asm-cris/arch-v10/system.h
index 6cc35642b8ab0d08c6182ba6256f8a642fe85299..4a9cd36c9e16e58b16e0dbb6f8e3a2db31145b86 100644 (file)
--- a/include/asm-cris/arch-v10/system.h
+++ b/include/asm-cris/arch-v10/system.h
@@ -1,11 +1,10 @@
 #ifndef __ASM_CRIS_ARCH_SYSTEM_H
 #define __ASM_CRIS_ARCH_SYSTEM_H
 
-#include <linux/config.h>
 
 /* read the CPU version register */
 
-extern inline unsigned long rdvr(void) { 
+static inline unsigned long rdvr(void) {
        unsigned char vr;
        __asm__ volatile ("move $vr,%0" : "=rm" (vr));
        return vr;
@@ -15,7 +14,7 @@ extern inline unsigned long rdvr(void) {
 
 /* read/write the user-mode stackpointer */
 
-extern inline unsigned long rdusp(void) {
+static inline unsigned long rdusp(void) {
        unsigned long usp;
        __asm__ __volatile__("move $usp,%0" : "=rm" (usp));
        return usp;
@@ -26,13 +25,13 @@ extern inline unsigned long rdusp(void) {
 
 /* read the current stackpointer */
 
-extern inline unsigned long rdsp(void) {
+static inline unsigned long rdsp(void) {
        unsigned long sp;
        __asm__ __volatile__("move.d $sp,%0" : "=rm" (sp));
        return sp;
 }
 
-extern inline unsigned long _get_base(char * addr)
+static inline unsigned long _get_base(char * addr)
 {
   return 0;
 }