X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Flinux%2Flinkage.h;h=5126cceb6ae97c7d401f197497f0a1311e55fe6f;hb=851b147e4411df6a1e7e90e2a609773c277eefd2;hp=691f59171c6c722e52faaeaed4e086d46f646eb2;hpb=9b74aec028e7d7ce57b8deef490e440003555520;p=karo-tx-linux.git

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 691f59171c6c..5126cceb6ae9 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -57,6 +57,7 @@
 
 #ifdef __ASSEMBLY__
 
+#ifndef LINKER_SCRIPT
 #define ALIGN __ALIGN
 #define ALIGN_STR __ALIGN_STR
 
@@ -66,6 +67,7 @@
   ALIGN; \
   name:
 #endif
+#endif /* LINKER_SCRIPT */
 
 #ifndef WEAK
 #define WEAK(name)	   \