Pull m68knommu update from Greg Ungerer: . remove use of kernel config option from uapi header * tag 'm68knommu-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: Avoid CONFIG_COLDFIRE switch in uapi header
Unified · Split
| @@ -39,7 +39,7 @@ struct pt_regs { · 38 unmodified lines | ||
| 39 | 39 | long d0; |
| 40 | 40 | long orig_d0; |
| 41 | 41 | long stkadj; |
| 42 | −#ifdef CONFIG_COLDFIRE | |
| 42 | +#ifdef __mcoldfire__ | |
| 43 | 43 | unsigned format : 4; /* frame format specifier */ |
| 44 | 44 | unsigned vector : 12; /* vector offset */ |
| 45 | 45 | unsigned short sr; |
| @@ -74,7 +74,6 @@ arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_16K · 73 unmodified lines | ||
| 74 | 74 | arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_4K |
| 75 | 75 | arch/arc/include/uapi/asm/swab.h:CONFIG_ARC_HAS_SWAPE |
| 76 | 76 | arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE8 |
| 77 | −arch/m68k/include/uapi/asm/ptrace.h:CONFIG_COLDFIRE | |
| 78 | 77 | arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO |
| 79 | 78 | arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT |
| 80 | 79 | arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION |