m68k: use the mc146818rtc.h for non-mmu setups as well.
authorGreg Ungerer <gerg@uclinux.org>
Thu, 29 Jan 2009 05:38:57 +0000 (15:38 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 Mar 2009 05:17:41 +0000 (15:17 +1000)
The mmu varient of mc146818rtc.h can be use on the non-mmu builds as well.
Revert to the single mc146818rtc.h file.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/mc146818rtc.h
arch/m68k/include/asm/mc146818rtc_mm.h [deleted file]
arch/m68k/include/asm/mc146818rtc_no.h [deleted file]

Simple merge
diff --cc arch/m68k/include/asm/mc146818rtc_mm.h
Simple merge
diff --cc arch/m68k/include/asm/mc146818rtc_no.h
Simple merge