diff options
| author | Tom Rini <trini@ti.com> | 2014-12-15 17:13:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-15 17:13:47 -0500 |
| commit | b9206e61f3d87535ac4f4b0b858e674fd1edfeaf (patch) | |
| tree | f7fc5d96b6b4b783dbccf2619157caf4faf66b5b /include/linux | |
| parent | 6983951a612aeecd906521e31de83d7fae309950 (diff) | |
| parent | 7cbd74f7484e9a58f7109e74e81002fee029b2f7 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/linkage.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 7435fcd026..5797498adc 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -17,7 +17,9 @@ #define CPP_ASMLINKAGE #endif +#ifndef asmlinkage #define asmlinkage CPP_ASMLINKAGE +#endif #define SYMBOL_NAME_STR(X) #X #define SYMBOL_NAME(X) X |