diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-26 05:50:29 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-26 05:50:29 -0400 |
| commit | e8c2cd99a3933d93413910bc93cbd5b53177110b (patch) | |
| tree | ea4c1d63b1bdeb9ef1aacacad0ac9c7dc0768fdc /include/asm-alpha/compiler.h | |
| parent | 5a8c0cc32bb6e029cd9c36f655c6b0955b0d9967 (diff) | |
| parent | 8ddec7460d2f5db3ac35812c03676b1473d1d668 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'include/asm-alpha/compiler.h')
| -rw-r--r-- | include/asm-alpha/compiler.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-alpha/compiler.h b/include/asm-alpha/compiler.h index 399c33b7be51..0a4a8b40dfcd 100644 --- a/include/asm-alpha/compiler.h +++ b/include/asm-alpha/compiler.h | |||
| @@ -98,6 +98,9 @@ | |||
| 98 | #undef inline | 98 | #undef inline |
| 99 | #undef __inline__ | 99 | #undef __inline__ |
| 100 | #undef __inline | 100 | #undef __inline |
| 101 | 101 | #if __GNUC__ == 3 && __GNUC_MINOR__ >= 1 || __GNUC__ > 3 | |
| 102 | #undef __always_inline | ||
| 103 | #define __always_inline inline __attribute__((always_inline)) | ||
| 104 | #endif | ||
| 102 | 105 | ||
| 103 | #endif /* __ALPHA_COMPILER_H */ | 106 | #endif /* __ALPHA_COMPILER_H */ |