Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / arch / blackfin / include / asm / linkage.h

diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h
index fbb497c7bdcf60031af1c861418289547ba92560..6d4493a6c529a14fc7a4e084662e51018d868151 100644 (file)
--- a/arch/blackfin/include/asm/linkage.h
+++ b/arch/blackfin/include/asm/linkage.h
@@ -22,53 +22,7 @@
  * MA 02110-1301 USA
  */
 
-#ifndef _LINUX_LINKAGE_H
-#define _LINUX_LINKAGE_H
-
-#include <linux/config.h>
-
-#ifdef __cplusplus
-#define CPP_ASMLINKAGE         extern "C"
-#else
-#define CPP_ASMLINKAGE
-#endif
-
-#define asmlinkage CPP_ASMLINKAGE
-
-#define SYMBOL_NAME_STR(X)     #X
-#define SYMBOL_NAME(X)         X
-#ifdef __STDC__
-#define SYMBOL_NAME_LABEL(X)   X##:
-#else
-#define SYMBOL_NAME_LABEL(X)   X:
-#endif
-
-#define __ALIGN .align         4
-#define __ALIGN_STR            ".align 4"
-
-#ifdef __ASSEMBLY__
-
-#define ALIGN                  __ALIGN
-#define ALIGN_STR              __ALIGN_STR
-
-#define LENTRY(name) \
-       ALIGN; \
-       SYMBOL_NAME_LABEL(name)
-
-#define ENTRY(name) \
-       .globl SYMBOL_NAME(name); \
-       LENTRY(name)
-#endif
-
-#ifndef END
-#define END(name) \
-       .size name, .-name
-#endif
-
-#ifndef ENDPROC
-#define ENDPROC(name) \
-       .type name, @function; \
-       END(name)
-#endif
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
 
 #endif