Merge the mmu arch/m68k/kernel/traps_mm.c and non-mmu traps_no.c. By moving out the vector setting code the rest of the traps code is the same for all m68k CPU types. a/arch/m68k/kernel/traps_mm.c | 1092 ----------------------------------- arch/m68k/kernel/traps_no.c | 361 ----------- b/arch/m68k/include/asm/processor.h | 6 b/arch/m68k/kernel/Makefile | 2 b/arch/m68k/kernel/traps.c | 1108 +++++++++++++++++++++++++++++++++++- b/arch/m68k/kernel/traps_mm.c | 115 --- b/arch/m68k/kernel/vectors.c | 145 ++++ 7 files changed, 1257 insertions(+), 1572 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html