Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 96b91982805316769128ac8e5a00791b5b4cf8bf..a8e1e604dfa81427b19d77a1ae3d81fdfb9841c8 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -17,15 +17,34 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
+config GENERIC_HWEIGHT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config TIME_LOW_RES
+       bool
+       default y
+
 config ARCH_MAY_HAVE_PC_FDC
        bool
        depends on Q40 || (BROKEN && SUN3X)
        default y
 
+config NO_IOPORT
+       def_bool y
+
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
@@ -423,6 +442,10 @@ config GENERIC_ISA_DMA
        depends on Q40 || AMIGA_PCMCIA || GG2
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 source "drivers/pci/Kconfig"
 
 source "drivers/zorro/Kconfig"
@@ -592,7 +615,7 @@ config MVME147_SCC
 
 config SERIAL167
        bool "CD2401 support for MVME166/7 serial ports"
-       depends on MVME16x && BROKEN
+       depends on MVME16x
        help
          This is the driver for the serial ports on the Motorola MVME166,
          167, and 172 boards.  Everyone using one of these boards should say