Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[karo-tx-linux.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 677c93a490f6f49501e4c7d2e375fd42bb4dabc5..fb87c08c6b57b5ca5fa126d615c93768b8e0ce7c 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -62,6 +62,8 @@ mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 menu "Platform dependent setup"
 
 config EISA
@@ -278,7 +280,6 @@ config M68060
 
 config MMU_MOTOROLA
        bool
-       depends on MMU && !MMU_SUN3
 
 config MMU_SUN3
        bool
@@ -302,7 +303,7 @@ config M68KFPU_EMU_EXTRAPREC
          correct rounding, the emulator can (often) do the same but this
          extra calculation can cost quite some time, so you can disable
          it here. The emulator will then "only" calculate with a 64 bit
-         mantissa and round slightly incorrect, what is more then enough
+         mantissa and round slightly incorrect, what is more than enough
          for normal usage.
 
 config M68KFPU_EMU_ONLY