diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:45:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:45:36 +0200 |
| commit | 9b40e16ee51a0e9255cd2571c76b1c8a0b504c74 (patch) | |
| tree | fc2226242e187d1827398bd527b9a795e3458ff9 /scripts/sorttable.c | |
| parent | staging; wlan-ng: remove duplicate USB device ID (diff) | |
| parent | Linux 5.15-rc3 (diff) | |
Merge branch 5.15-rc3 into staging-next
We need the fixes in here, and it resolves a merge issue with
drivers/staging/r8188eu/os_dep/ioctl_linux.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/sorttable.c')
| -rw-r--r-- | scripts/sorttable.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/sorttable.c b/scripts/sorttable.c index f355869c65cd..6ee4fa882919 100644 --- a/scripts/sorttable.c +++ b/scripts/sorttable.c @@ -54,6 +54,10 @@ #define EM_ARCV2 195 #endif +#ifndef EM_RISCV +#define EM_RISCV 243 +#endif + static uint32_t (*r)(const uint32_t *); static uint16_t (*r2)(const uint16_t *); static uint64_t (*r8)(const uint64_t *); |