X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flinux%2Flinkage.h;h=5797498adceceb48c5368d91c3155a59daadb094;hb=a83fccc2c979263ba88a6801130258124caca51a;hp=9ddf83028465806345e8e6e1177a4caab0337064;hpb=c2120fbfbc4d1f6953228f86be8bdbf38bacfdab;p=u-boot

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 9ddf830284..5797498adc 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -10,7 +10,6 @@
 #define _LINUX_LINKAGE_H
 
 #include <asm/linkage.h>
-#include <linux/config.h>
 
 #ifdef __cplusplus
 #define CPP_ASMLINKAGE		extern "C"
@@ -18,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
@@ -49,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