diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-10-27 09:17:01 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-27 09:17:01 +0200 |
| commit | 64d329eec0313a071edd8176faf0a803012796d7 (patch) | |
| tree | c6640d6fc75d13edbf6c477b99db7627a4acdc06 /include/asm-sparc/system.h | |
| parent | [SPARC64]: __inline__ --> inline (diff) | |
| download | linux-64d329eec0313a071edd8176faf0a803012796d7.tar.xz linux-64d329eec0313a071edd8176faf0a803012796d7.zip | |
[SPARC32]: __inline__ --> inline
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | include/asm-sparc/system.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index 8c259de02614..2655d142b22d 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h @@ -1,5 +1,3 @@ -/* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */ - #ifndef __SPARC_SYSTEM_H #define __SPARC_SYSTEM_H @@ -56,7 +54,7 @@ extern void sun_do_break(void); extern int serial_console; extern int stop_a_enabled; -static __inline__ int con_is_present(void) +static inline int con_is_present(void) { return serial_console ? 0 : 1; } @@ -217,7 +215,7 @@ static inline unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned lon extern void __xchg_called_with_bad_pointer(void); -static __inline__ unsigned long __xchg(unsigned long x, __volatile__ void * ptr, int size) +static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr, int size) { switch (size) { case 4: |