diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:43:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:43:37 +0200 |
| commit | b5bc8ac25aa1477fee3853718f2673a594efdc4b (patch) | |
| tree | dcee1a7ae080d573c12a4a0411b9417746ffd343 /arch/riscv/kernel/syscall_table.c | |
| parent | 1f8818e352f721c49ebea39025f6c98f25756eff (diff) | |
| parent | 519d81956ee277b4419c723adfb154603c2565ba (diff) | |
Merge 5.15-rc6 into driver-core-next
We need the driver-core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/riscv/kernel/syscall_table.c')
| -rw-r--r-- | arch/riscv/kernel/syscall_table.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/riscv/kernel/syscall_table.c b/arch/riscv/kernel/syscall_table.c index a63c667c27b3..44b1420a2270 100644 --- a/arch/riscv/kernel/syscall_table.c +++ b/arch/riscv/kernel/syscall_table.c @@ -7,7 +7,6 @@ #include <linux/linkage.h> #include <linux/syscalls.h> #include <asm-generic/syscalls.h> -#include <asm/vdso.h> #include <asm/syscall.h> #undef __SYSCALL |