m68k: merge the MMU and non-MMU versions of the entry.S code
authorGreg Ungerer <gerg@uclinux.org>
Wed, 9 May 2012 07:05:24 +0000 (17:05 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Sun, 15 Jul 2012 23:59:21 +0000 (09:59 +1000)
commit14be4252eae2ce40abec5872bf6011891d753433
treec22f7ffd9797d539573d6280add823edcc09efa5
parent28d5445e94ab22198921b5c0c3e58c3b4a1a0116
m68k: merge the MMU and non-MMU versions of the entry.S code

Some of the entry.S code is common to both MMU and non-MMU builds.
So merge the entry_no.S and entry_mm.S files back into a single file.
With a little code movement we only need a single #ifdef.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/kernel/entry.S
arch/m68k/kernel/entry_mm.S [deleted file]
arch/m68k/kernel/entry_no.S [deleted file]