Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[linux-2.6-omap-h63xx.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 8849439e88dd35f997238d0fbee9e4eea3c342ed..a86e2e9a639fff5c20a9378cf9f27c52158a4623 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -17,6 +17,18 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
 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 GENERIC_CALIBRATE_DELAY
        bool
        default y


@@ -30,6 +42,9 @@ config ARCH_MAY_HAVE_PC_FDC
        depends on Q40 || (BROKEN && SUN3X)
        default y
 
        depends on Q40 || (BROKEN && SUN3X)
        default y
 

+config NO_IOPORT
+       def_bool y
+

 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"


@@ -340,8 +355,9 @@ config RMW_INSNS
          adventurous.
 
 config SINGLE_MEMORY_CHUNK
          adventurous.
 
 config SINGLE_MEMORY_CHUNK

-       bool "Use one physical chunk of memory only"
-       depends on ADVANCED && !SUN3
+       bool "Use one physical chunk of memory only" if ADVANCED && !SUN3
+       default y if SUN3
+       select NEED_MULTIPLE_NODES

        help
          Ignore all but the first contiguous chunk of physical memory for VM
          purposes.  This will save a few bytes kernel size and may speed up
        help
          Ignore all but the first contiguous chunk of physical memory for VM
          purposes.  This will save a few bytes kernel size and may speed up


@@ -362,6 +378,14 @@ config 060_WRITETHROUGH
          is hardwired on.  The 53c710 SCSI driver is known to suffer from
          this problem.
 
          is hardwired on.  The 53c710 SCSI driver is known to suffer from
          this problem.
 

+config ARCH_DISCONTIGMEM_ENABLE
+       def_bool !SINGLE_MEMORY_CHUNK
+
+config NODES_SHIFT
+       int
+       default "3"
+       depends on !SINGLE_MEMORY_CHUNK
+

 source "mm/Kconfig"
 
 endmenu
 source "mm/Kconfig"
 
 endmenu


@@ -427,6 +451,10 @@ config GENERIC_ISA_DMA
        depends on Q40 || AMIGA_PCMCIA || GG2
        default y
 
        depends on Q40 || AMIGA_PCMCIA || GG2
        default y
 

+config ZONE_DMA
+       bool
+       default y
+

 source "drivers/pci/Kconfig"
 
 source "drivers/zorro/Kconfig"
 source "drivers/pci/Kconfig"
 
 source "drivers/zorro/Kconfig"


@@ -596,7 +624,7 @@ config MVME147_SCC
 
 config SERIAL167
        bool "CD2401 support for MVME166/7 serial ports"
 
 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
        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