Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6] / include / asm-sparc64 / visasm.h

diff --git a/include/asm-sparc64/visasm.h b/include/asm-sparc64/visasm.h
index a74078551e0fcf8c73ecd9e0b9c4105d1b8f2dc6..34f2ec64933b1e25f7463e587e2070dc26d89175 100644 (file)
--- a/include/asm-sparc64/visasm.h
+++ b/include/asm-sparc64/visasm.h
@@ -1,4 +1,3 @@
-/* $Id: visasm.h,v 1.5 2001/04/24 01:09:12 davem Exp $ */
 #ifndef _SPARC64_VISASM_H
 #define _SPARC64_VISASM_H
 
@@ -44,7 +43,7 @@
        wr              %o5, 0, %fprs;
 
 #ifndef __ASSEMBLY__   
-static __inline__ void save_and_clear_fpu(void) {
+static inline void save_and_clear_fpu(void) {
        __asm__ __volatile__ (
 "              rd %%fprs, %%o5\n"
 "              andcc %%o5, %0, %%g0\n"