diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-11-05 09:43:47 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-11-05 09:43:47 +0100 |
| commit | e301aea030d60da760f85f854a82ce788d5cf6e7 (patch) | |
| tree | 0518946973b140be8105fb5b5bc45760675e5d1d /arch/riscv/kernel/asm-offsets.c | |
| parent | b04ce1e718bd55302b52d05d6873e233cb3ec7a1 (diff) | |
| parent | 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 (diff) | |
| download | linux-e301aea030d60da760f85f854a82ce788d5cf6e7.tar.gz linux-e301aea030d60da760f85f854a82ce788d5cf6e7.tar.bz2 linux-e301aea030d60da760f85f854a82ce788d5cf6e7.zip | |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get the latest fixes from v6.12-rc6.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'arch/riscv/kernel/asm-offsets.c')
| -rw-r--r-- | arch/riscv/kernel/asm-offsets.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/riscv/kernel/asm-offsets.c b/arch/riscv/kernel/asm-offsets.c index e94180ba432f..c2f3129a8e5c 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -4,8 +4,6 @@ * Copyright (C) 2017 SiFive */ -#define GENERATING_ASM_OFFSETS - #include <linux/kbuild.h> #include <linux/mm.h> #include <linux/sched.h> |