Merge tag 'acpi-5.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / arch / m68k / Kconfig.machine

diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine
index cf6961d..4d59ec2 100644 (file)
--- a/arch/m68k/Kconfig.machine
+++ b/arch/m68k/Kconfig.machine
@@ -145,14 +145,13 @@ config SUN3
 
          If you don't want to compile a kernel exclusively for a Sun 3, say N.
 
-endif # M68KCLASSIC
-
 config PILOT
        bool
 
 config PILOT3
        bool "Pilot 1000/5000, PalmPilot Personal/Pro, or PalmIII support"
-       depends on M68328
+       depends on !MMU
+       select M68328
        select PILOT
        help
          Support for the Palm Pilot 1000/5000, Personal/Pro and PalmIII.
@@ -165,19 +164,22 @@ config XCOPILOT_BUGS
 
 config UCSIMM
        bool "uCsimm module support"
-       depends on M68EZ328
+       depends on !MMU
+       select M68EZ328
        help
          Support for the Arcturus Networks uCsimm module.
 
 config UCDIMM
        bool "uDsimm module support"
-       depends on M68VZ328
+       depends on !MMU
+       select M68VZ328
        help
          Support for the Arcturus Networks uDsimm module.
 
 config DRAGEN2
        bool "DragenEngine II board support"
-       depends on M68VZ328
+       depends on !MMU
+       select M68VZ328
        help
          Support for the DragenEngine II board.
 
@@ -200,6 +202,8 @@ config MEMORY_RESERVE
        help
          Reserve certain memory regions on 68x328 based boards.
 
+endif # M68KCLASSIC
+
 config ARN5206
        bool "Arnewsh 5206 board support"
        depends on M5206