Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[cascardo/linux.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 361d540..ae413d4 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -3,10 +3,10 @@ config M68K
        default y
        select HAVE_IDE
        select HAVE_AOUT if MMU
-       select GENERIC_ATOMIC64 if MMU
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
+       select GENERIC_CPU_DEVICES
 
 config RWSEM_GENERIC_SPINLOCK
        bool
@@ -38,15 +38,15 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config GENERIC_IOMAP
-       def_bool MMU
+config GENERIC_CSUM
+       bool
 
 config TIME_LOW_RES
        bool
        default y
 
 config ARCH_USES_GETTIMEOFFSET
-       def_bool MMU
+       def_bool MMU && !COLDFIRE
 
 config NO_IOPORT
        def_bool y
@@ -61,6 +61,12 @@ config ZONE_DMA
 config CPU_HAS_NO_BITFIELDS
        bool
 
+config CPU_HAS_NO_MULDIV64
+       bool
+
+config CPU_HAS_ADDRESS_SPACES
+       bool
+
 config HZ
        int
        default 1000 if CLEOPATRA
@@ -73,6 +79,7 @@ source "kernel/Kconfig.freezer"
 config MMU
        bool "MMU-based Paged Memory Management Support"
        default y
+       select GENERIC_IOMAP
        help
          Select if you want MMU-based virtualised addressing space
          support by paged memory management. If unsure, say 'Y'.
@@ -80,9 +87,12 @@ config MMU
 config MMU_MOTOROLA
        bool
 
+config MMU_COLDFIRE
+       bool
+
 config MMU_SUN3
        bool
-       depends on MMU && !MMU_MOTOROLA
+       depends on MMU && !MMU_MOTOROLA && !MMU_COLDFIRE
 
 menu "Platform setup"