aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68k/Kconfig1
-rw-r--r--arch/m68k/Kconfig.cpu6
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 498b567f007b..d140206d5d29 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -14,7 +14,6 @@ config M68K
14 select GENERIC_IOMAP 14 select GENERIC_IOMAP
15 select GENERIC_STRNCPY_FROM_USER if MMU 15 select GENERIC_STRNCPY_FROM_USER if MMU
16 select GENERIC_STRNLEN_USER if MMU 16 select GENERIC_STRNLEN_USER if MMU
17 select FPU if MMU
18 select ARCH_WANT_IPC_PARSE_VERSION 17 select ARCH_WANT_IPC_PARSE_VERSION
19 select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE 18 select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
20 select HAVE_FUTEX_CMPXCHG if MMU && FUTEX 19 select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index 967260f2eb1c..d2219f30b78f 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -62,6 +62,7 @@ config MCPU32
62config M68020 62config M68020
63 bool "68020 support" 63 bool "68020 support"
64 depends on MMU 64 depends on MMU
65 select FPU
65 select CPU_HAS_ADDRESS_SPACES 66 select CPU_HAS_ADDRESS_SPACES
66 help 67 help
67 If you anticipate running this kernel on a computer with a MC68020 68 If you anticipate running this kernel on a computer with a MC68020
@@ -72,6 +73,7 @@ config M68020
72config M68030 73config M68030
73 bool "68030 support" 74 bool "68030 support"
74 depends on MMU && !MMU_SUN3 75 depends on MMU && !MMU_SUN3
76 select FPU
75 select CPU_HAS_ADDRESS_SPACES 77 select CPU_HAS_ADDRESS_SPACES
76 help 78 help
77 If you anticipate running this kernel on a computer with a MC68030 79 If you anticipate running this kernel on a computer with a MC68030
@@ -81,6 +83,7 @@ config M68030
81config M68040 83config M68040
82 bool "68040 support" 84 bool "68040 support"
83 depends on MMU && !MMU_SUN3 85 depends on MMU && !MMU_SUN3
86 select FPU
84 select CPU_HAS_ADDRESS_SPACES 87 select CPU_HAS_ADDRESS_SPACES
85 help 88 help
86 If you anticipate running this kernel on a computer with a MC68LC040 89 If you anticipate running this kernel on a computer with a MC68LC040
@@ -91,6 +94,7 @@ config M68040
91config M68060 94config M68060
92 bool "68060 support" 95 bool "68060 support"
93 depends on MMU && !MMU_SUN3 96 depends on MMU && !MMU_SUN3
97 select FPU
94 select CPU_HAS_ADDRESS_SPACES 98 select CPU_HAS_ADDRESS_SPACES
95 help 99 help
96 If you anticipate running this kernel on a computer with a MC68060 100 If you anticipate running this kernel on a computer with a MC68060
@@ -259,6 +263,7 @@ config M547x
259 bool "MCF547x" 263 bool "MCF547x"
260 select M54xx 264 select M54xx
261 select MMU_COLDFIRE if MMU 265 select MMU_COLDFIRE if MMU
266 select FPU if MMU
262 select HAVE_CACHE_CB 267 select HAVE_CACHE_CB
263 select HAVE_MBAR 268 select HAVE_MBAR
264 select CPU_NO_EFFICIENT_FFS 269 select CPU_NO_EFFICIENT_FFS
@@ -268,6 +273,7 @@ config M547x
268config M548x 273config M548x
269 bool "MCF548x" 274 bool "MCF548x"
270 select MMU_COLDFIRE if MMU 275 select MMU_COLDFIRE if MMU
276 select FPU if MMU
271 select M54xx 277 select M54xx
272 select HAVE_CACHE_CB 278 select HAVE_CACHE_CB
273 select HAVE_MBAR 279 select HAVE_MBAR