diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-07 00:22:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-07 00:22:01 +0200 |
commit | 3b69e8b4571125bec1f77f886174fe6cab6b9d75 (patch) | |
tree | 4a125694310d161b6cb3097c4bf7542e97919987 /arch/sh/include/asm/syscall.h | |
parent | Merge tag 'kconfig-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
parent | sh: remove sh5 support (diff) | |
download | linux-3b69e8b4571125bec1f77f886174fe6cab6b9d75.tar.xz linux-3b69e8b4571125bec1f77f886174fe6cab6b9d75.zip |
Merge tag 'sh-for-5.8' of git://git.libc.org/linux-sh
Pull arch/sh updates from Rich Felker:
"Fix for arch/sh build regression with newer binutils, removal of SH5,
fixes for module exports, and misc cleanup"
* tag 'sh-for-5.8' of git://git.libc.org/linux-sh:
sh: remove sh5 support
sh: add missing EXPORT_SYMBOL() for __delay
sh: Convert ins[bwl]/outs[bwl] macros to inline functions
sh: Convert iounmap() macros to inline functions
sh: Add missing DECLARE_EXPORT() for __ashiftrt_r4_xx
sh: configs: Cleanup old Kconfig IO scheduler options
arch/sh: vmlinux.scr
sh: Replace CONFIG_MTD_M25P80 with CONFIG_MTD_SPI_NOR in sh7757lcr_defconfig
sh: sh4a: Bring back tmu3_device early device
Diffstat (limited to 'arch/sh/include/asm/syscall.h')
-rw-r--r-- | arch/sh/include/asm/syscall.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/sh/include/asm/syscall.h b/arch/sh/include/asm/syscall.h index 90ba00002626..570699eb0e58 100644 --- a/arch/sh/include/asm/syscall.h +++ b/arch/sh/include/asm/syscall.h @@ -4,10 +4,6 @@ extern const unsigned long sys_call_table[]; -#ifdef CONFIG_SUPERH32 -# include <asm/syscall_32.h> -#else -# include <asm/syscall_64.h> -#endif +#include <asm/syscall_32.h> #endif /* __ASM_SH_SYSCALL_H */ |