diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-10-04 09:02:31 +0200 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2021-10-26 08:46:27 +1000 |
| commit | 6dbe88e93c351a6cf5b7c70850d7a1a7f67d83ab (patch) | |
| tree | f68ca0b28a99c26c4af0edeec8783423df6afaa4 | |
| parent | 1aaa557b2db95c9506ed0981bc34505c32d6b62b (diff) | |
| download | iwlwifi-fixes-6dbe88e93c351a6cf5b7c70850d7a1a7f67d83ab.tar.gz | |
m68knommu: Remove MCPU32 config symbol
As of commit a3595962d82495f5 ("m68knommu: remove obsolete 68360
support"), nothing selects MCPU32 anymore.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
| -rw-r--r-- | arch/m68k/Kconfig.cpu | 11 | ||||
| -rw-r--r-- | arch/m68k/include/asm/bitops.h | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index 277d61a094637c..0d00ef5117dcee 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -53,17 +53,6 @@ config M68000 System-On-Chip devices (eg 68328, 68302, etc). It does not contain a paging MMU. -config MCPU32 - bool - select CPU_HAS_NO_BITFIELDS - select CPU_HAS_NO_CAS - select CPU_HAS_NO_UNALIGNED - select CPU_NO_EFFICIENT_FFS - help - The Freescale (was then Motorola) CPU32 is a CPU core that is - based on the 68020 processor. For the most part it is used in - System-On-Chip parts, and does not contain a paging MMU. - config M68020 bool "68020 support" depends on MMU diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index 7b414099e5fc20..7b93e1fd8ffa90 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -451,7 +451,7 @@ static inline unsigned long ffz(unsigned long word) * generic functions for those. */ #if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \ - !defined(CONFIG_M68000) && !defined(CONFIG_MCPU32) + !defined(CONFIG_M68000) static inline unsigned long __ffs(unsigned long x) { __asm__ __volatile__ ("bitrev %0; ff1 %0" |