Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 into for-linus

[karo-tx-linux.git] / include / asm-um / linkage.h

diff --git a/include/asm-um/linkage.h b/include/asm-um/linkage.h
index 7dfce37adc8be83424c4463e50a635acfa72650a..78b862472b363e9bde4c01e43b3f69d81697bd7d 100644 (file)
--- a/include/asm-um/linkage.h
+++ b/include/asm-um/linkage.h
@@ -3,4 +3,11 @@
 
 #include "asm/arch/linkage.h"
 
+
+/* <linux/linkage.h> will pick sane defaults */
+#ifdef CONFIG_GPROF
+#undef FASTCALL
+#undef fastcall
+#endif
+
 #endif