diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-02-13 23:13:22 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-02-13 23:13:22 +0100 |
| commit | 06576b2efcf3d67797437488e90e989b8b48c9f2 (patch) | |
| tree | b6dd4e3ae4d09b221ec9c36f6793ba12668d0130 /arch/blackfin/include/asm/linkage.h | |
| parent | 9a3aae22edf1eda6326cc51c28631ca5c23b7706 (diff) | |
| parent | 44f67f784889e1a27958fa3e995abe41ab925697 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
* 'master' of git://git.denx.de/u-boot-blackfin:
Blackfin: pata_bfin: fix printf warning
Blackfin: bfin_nand: mark local func static
linkage.h: move from blackfin to common includes
Blackfin: br4: new board port
Blackfin: add in/out le32 variants
post: add blackfin to the post_time_ms list
Blackfin: bf537-stamp: drop board reset workaround
Blackfin: pr1: new board port
Diffstat (limited to 'arch/blackfin/include/asm/linkage.h')
| -rw-r--r-- | arch/blackfin/include/asm/linkage.h | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h index fbb497c7bd..6d4493a6c5 100644 --- 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 |