Merge branch 'for-linus' into for-next

[~andy/linux] / arch / m68k / Kconfig.cpu

diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index 2f2d87b40341fc859506a2a3489faefeb60d902f..b1cfff832fb5c56a6543d075ddbccee25fb7305e 100644 (file)
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -35,7 +35,8 @@ endchoice
 if M68KCLASSIC
 
 config M68000
-       bool
+       bool "MC68000"
+       depends on !MMU
        select CPU_HAS_NO_BITFIELDS
        select CPU_HAS_NO_MULDIV64
        select CPU_HAS_NO_UNALIGNED