Merge git://git.denx.de/u-boot-x86

[people/ms/u-boot.git] / include / linux / linkage.h

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 39c712eac5b912b6cd2bd1ece7abf17213125552..5797498adceceb48c5368d91c3155a59daadb094 100644 (file)
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -17,7 +17,9 @@
 #define CPP_ASMLINKAGE
 #endif
 
+#ifndef asmlinkage
 #define asmlinkage CPP_ASMLINKAGE
+#endif
 
 #define SYMBOL_NAME_STR(X)     #X
 #define SYMBOL_NAME(X)         X
@@ -48,6 +50,10 @@
        .globl SYMBOL_NAME(name); \
        LENTRY(name)
 
+#define WEAK(name) \
+       .weak SYMBOL_NAME(name); \
+       LENTRY(name)
+
 #ifndef END
 #define END(name) \
        .size name, .-name