m68k: merge mmu and non-mmu versions of time.c
authorGreg Ungerer <gerg@uclinux.org>
Mon, 23 Jan 2012 06:23:33 +0000 (16:23 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Sun, 4 Mar 2012 23:43:04 +0000 (09:43 +1000)
commitfa7f9e7fade84571800977782b04e07cb0a5dae3
treec2d5450f1a9276ed5c580b39f7d9ba3b03fbabf9
parentb6c58e8af0d1188ce826bb35444f11752000e5e1
m68k: merge mmu and non-mmu versions of time.c

There is only trivial differences between the mmu time_mm.c and non-mmu
time_no.c files. Merge them back into a single time.c.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/kernel/time.c
arch/m68k/kernel/time_mm.c [deleted file]
arch/m68k/kernel/time_no.c [deleted file]