From: Greg Ungerer <gerg@uclinux.org>
Date: Mon, 18 Apr 2011 05:27:55 +0000 (+1000)
Subject: m68k: let Makefile sort out compiling mmu and non-mmu lib/checksum.c
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9461702d2a54cd4d9da09b7755c96815791a9d07;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

m68k: let Makefile sort out compiling mmu and non-mmu lib/checksum.c

We don't need an arch/m68k/lib/checksum.c wrapper to include the correct
mmu or non-mmu version of the checksum code. Let the Makefile just build
the appropriate one.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---

diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index 2438d02ebf43..df421e501436 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -4,11 +4,11 @@
 #
 
 lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
-	   memcpy.o memset.o memmove.o checksum.o
+	   memcpy.o memset.o memmove.o
 
 ifdef CONFIG_MMU
-lib-y	+= string.o uaccess.o
+lib-y	+= string.o uaccess.o checksum_mm.o
 else
-lib-y	+= mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o delay.o
+lib-y	+= mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o delay.o checksum_no.o
 endif
 
diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c
deleted file mode 100644
index 1297536060de..000000000000
--- a/arch/m68k/lib/checksum.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef CONFIG_MMU
-#include "checksum_mm.c"
-#else
-#include "checksum_no.c"
-#endif