From: Greg Ungerer Date: Wed, 9 May 2012 07:05:24 +0000 (+1000) Subject: m68k: merge the MMU and non-MMU versions of the entry.S code X-Git-Tag: v3.6-rc1~108^2~18 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14be4252eae2ce40abec5872bf6011891d753433;p=pandora-kernel.git 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 Acked-by: Geert Uytterhoeven --- Reading git-diff-tree failed