]> git.karo-electronics.de Git - karo-tx-linux.git/commit
m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types
authorGreg Ungerer <gerg@uclinux.org>
Wed, 23 May 2012 01:32:45 +0000 (11:32 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 12 Jun 2012 01:58:26 +0000 (11:58 +1000)
commitb13b3f51ff7bec19ac1ba66e3623bfaa484af124
treee37109197cb7b8131dec6cb9d6a9c6e51c1976c8
parentf75b0d07da12e67559d51071391feaf0c265d292
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 <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/kernel/time.c