Unified codebase for TX28, TX48, TX51, TX53

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

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index ed4cf6cbcd507a8f53b7ed9bc68b8e2f0e84de60..7b749bbda708a8b6f1edcbbcd0becf21e566d2d7 100644 (file)
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -44,8 +44,13 @@
 #define SYMBOL_NAME_LABEL(X)   X:
 #endif
 
+#ifndef __ALIGN
 #define __ALIGN .align         4
+#endif
+
+#ifndef __ALIGN_STR
 #define __ALIGN_STR            ".align 4"
+#endif
 
 #ifdef __ASSEMBLY__
 
@@ -67,7 +72,7 @@
 
 #ifndef ENDPROC
 #define ENDPROC(name) \
-       .type name, @function; \
+       .type name STT_FUNC; \
        END(name)
 #endif