From: Greg Ungerer Date: Wed, 23 May 2012 01:32:45 +0000 (+1000) Subject: m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types X-Git-Tag: v3.5-rc3~29^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b13b3f51ff7bec19ac1ba66e3623bfaa484af124;p=pandora-kernel.git m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types When building for non-MMU based classic 68k CPU types (like the 68328 for example) you get a compilation error: CC arch/m68k/kernel/time.o arch/m68k/kernel/time.c:91:5: error: redefinition of ‘arch_gettimeoffset’ include/linux/time.h:145:19: note: previous definition of ‘arch_gettimeoffset’ was here The arch_gettimeoffset() code is included when building for these CPU types, but it shouldn't be. Those machine types do not have CONFIG_ARCH_USES_GETTIMEOFFSET set. The fix is simply to conditionally include the arch_gettimeoffset() code on that same config setting that specifies its use or not. Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- Reading git-diff-tree failed