Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...

[pandora-kernel.git] / include / asm-um / linkage.h

diff --git a/include/asm-um/linkage.h b/include/asm-um/linkage.h
index 7dfce37..78b8624 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