Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / include / asm-alpha / compiler.h

diff --git a/include/asm-alpha/compiler.h b/include/asm-alpha/compiler.h
index 399c33b7be5112732a4f1f31d2d401a696df511e..00c6f57ad9a7a43ea189fb4b14a07f6218277872 100644 (file)
--- a/include/asm-alpha/compiler.h
+++ b/include/asm-alpha/compiler.h
@@ -98,6 +98,7 @@
 #undef inline
 #undef __inline__
 #undef __inline
-
+#undef __always_inline
+#define __always_inline                inline __attribute__((always_inline))
 
 #endif /* __ALPHA_COMPILER_H */