From 24105881ae843cd05c40a32cc4b0f44c58e477ff Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 18 Oct 2011 16:38:52 +1000 Subject: [PATCH] m68k: use of 64 div instruction is chip specific The use of the 64 div instruction should not be based on whether we are running MMU enabled or not. It is chip specific. The original 68000 family and the ColdFire CPU family do not support it, the other 680x0 CPU varients do. So make the conditional check based on that, not CONFIG_MMU. Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- arch/m68k/include/asm/div64.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/m68k/include/asm/div64.h b/arch/m68k/include/asm/div64.h index edb66148a71d..7265e405a304 100644 --- a/arch/m68k/include/asm/div64.h +++ b/arch/m68k/include/asm/div64.h @@ -1,7 +1,9 @@ #ifndef _M68K_DIV64_H #define _M68K_DIV64_H -#ifdef CONFIG_MMU +#if defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE) +#include +#else #include @@ -27,8 +29,6 @@ __rem; \ }) -#else -#include -#endif /* CONFIG_MMU */ +#endif /* CONFIG_M68000 || CONFIG_COLDFIRE */ #endif /* _M68K_DIV64_H */ -- 2.39.5