diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-10-15 06:47:38 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-10-15 06:47:38 +0200 |
| commit | 850fbcffe252368a87b3209a4b8edfbd18044c3f (patch) | |
| tree | 5f9c582018228f2c574cbaf3363478535f2715a2 /arch/sh/include/asm/unistd.h | |
| parent | Linux 3.7-rc1 (diff) | |
| parent | UAPI: (Scripted) Disintegrate arch/sh/include/asm (diff) | |
| download | linux-850fbcffe252368a87b3209a4b8edfbd18044c3f.tar.xz linux-850fbcffe252368a87b3209a4b8edfbd18044c3f.zip | |
Merge tag 'disintegrate-sh-20121009' of git://git.infradead.org/users/dhowells/linux-headers into sh-latest
UAPI Disintegration 2012-10-09
Diffstat (limited to 'arch/sh/include/asm/unistd.h')
| -rw-r--r-- | arch/sh/include/asm/unistd.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/sh/include/asm/unistd.h b/arch/sh/include/asm/unistd.h index 307201a854f3..38956dfa76f7 100644 --- a/arch/sh/include/asm/unistd.h +++ b/arch/sh/include/asm/unistd.h @@ -1,4 +1,3 @@ -#ifdef __KERNEL__ # ifdef CONFIG_SUPERH32 # include <asm/unistd_32.h> # else @@ -38,10 +37,4 @@ */ # define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") -#else -# ifdef __SH5__ -# include <asm/unistd_64.h> -# else -# include <asm/unistd_32.h> -# endif -#endif +#include <uapi/asm/unistd.h> |