diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-05-23 11:32:45 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-06-12 11:58:26 +1000 |
| commit | b13b3f51ff7bec19ac1ba66e3623bfaa484af124 (patch) | |
| tree | e37109197cb7b8131dec6cb9d6a9c6e51c1976c8 /arch | |
| parent | f75b0d07da12e67559d51071391feaf0c265d292 (diff) | |
| download | linux-3.10-b13b3f51ff7bec19ac1ba66e3623bfaa484af124.tar.gz linux-3.10-b13b3f51ff7bec19ac1ba66e3623bfaa484af124.tar.bz2 linux-3.10-b13b3f51ff7bec19ac1ba66e3623bfaa484af124.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index d7deb7fc7eb..707f0573ec6 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -85,7 +85,7 @@ void __init time_init(void) mach_sched_init(timer_interrupt); } -#ifdef CONFIG_M68KCLASSIC +#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET u32 arch_gettimeoffset(void) { @@ -108,4 +108,4 @@ static int __init rtc_init(void) module_init(rtc_init); -#endif /* CONFIG_M68KCLASSIC */ +#endif /* CONFIG_ARCH_USES_GETTIMEOFFSET */ |