diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-06-06 18:35:13 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-06-10 10:18:30 +0200 |
| commit | 5df58f3aac58bb0f08fa205a006c6b7840cd7ac4 (patch) | |
| tree | ed2dd7cdfb961ce51347eb2c46fc267bb3033801 | |
| parent | 022613e0b0753f1261454dea9b07c2e959363af7 (diff) | |
| download | linux-3.10-5df58f3aac58bb0f08fa205a006c6b7840cd7ac4.tar.gz linux-3.10-5df58f3aac58bb0f08fa205a006c6b7840cd7ac4.tar.bz2 linux-3.10-5df58f3aac58bb0f08fa205a006c6b7840cd7ac4.zip | |
m68k: delay, muldi3 - Use CONFIG_CPU_HAS_NO_MULDIV64
instead of open coding CONFIG_M68000 || CONFIG_COLDFIRE
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Greg Ungerer<gerg@uclinux.org>
| -rw-r--r-- | arch/m68k/include/asm/delay.h | 2 | ||||
| -rw-r--r-- | arch/m68k/lib/muldi3.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h index 9c09becfd4c..12d8fe4f1d3 100644 --- a/arch/m68k/include/asm/delay.h +++ b/arch/m68k/include/asm/delay.h @@ -43,7 +43,7 @@ static inline void __delay(unsigned long loops) extern void __bad_udelay(void); -#if defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE) +#ifdef CONFIG_CPU_HAS_NO_MULDIV64 /* * The simpler m68k and ColdFire processors do not have a 32*32->64 * multiply instruction. So we need to handle them a little differently. diff --git a/arch/m68k/lib/muldi3.c b/arch/m68k/lib/muldi3.c index 79e928a525d..ee5f0b1b5c5 100644 --- a/arch/m68k/lib/muldi3.c +++ b/arch/m68k/lib/muldi3.c @@ -19,7 +19,7 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#if defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE) +#ifdef CONFIG_CPU_HAS_NO_MULDIV64 #define SI_TYPE_SIZE 32 #define __BITS4 (SI_TYPE_SIZE / 4) |