Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 9ddf83028465806345e8e6e1177a4caab0337064..7435fcd0262bd4770159e1bd3ebf6d5a9444a54f 100644 (file)
--- 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"
@@ -49,6 +48,10 @@
        .globl SYMBOL_NAME(name); \
        LENTRY(name)
 
+#define WEAK(name) \
+       .weak SYMBOL_NAME(name); \
+       LENTRY(name)
+
 #ifndef END
 #define END(name) \
        .size name, .-name