fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 22a76f8..7a9877d 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -10,10 +10,6 @@ config MMU
        bool
        default y
 
        bool
        default y
 

-config UID16
-       bool
-       default y
-

 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y


@@ -21,10 +17,31 @@ 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
 

+config TIME_LOW_RES
+       bool
+       default y
+
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+       depends on Q40 || (BROKEN && SUN3X)
+       default y
+

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


@@ -357,6 +374,8 @@ 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.
 

+source "mm/Kconfig"
+

 endmenu
 
 menu "General setup"
 endmenu
 
 menu "General setup"


@@ -381,33 +400,11 @@ config AMIGA_PCMCIA
          Include support in the kernel for pcmcia on Amiga 1200 and Amiga
          600. If you intend to use pcmcia cards say Y; otherwise say N.
 
          Include support in the kernel for pcmcia on Amiga 1200 and Amiga
          600. If you intend to use pcmcia cards say Y; otherwise say N.
 

-config STRAM_SWAP
-       bool "Support for ST-RAM as swap space"
-       depends on ATARI && BROKEN
-       ---help---
-         Some Atari 68k machines (including the 520STF and 1020STE) divide
-         their addressable memory into ST and TT sections.  The TT section
-         (up to 512MB) is the main memory; the ST section (up to 4MB) is
-         accessible to the built-in graphics board, runs slower, and is
-         present mainly for backward compatibility with older machines.
-
-         This enables support for using (parts of) ST-RAM as swap space,
-         instead of as normal system memory. This can first enhance system
-         performance if you have lots of alternate RAM (compared to the size
-         of ST-RAM), because executable code always will reside in faster
-         memory. ST-RAM will remain as ultra-fast swap space. On the other
-         hand, it allows much improved dynamic allocations of ST-RAM buffers
-         for device driver modules (e.g. floppy, ACSI, SLM printer, DMA
-         sound). The probability that such allocations at module load time
-         fail is drastically reduced.
-

 config STRAM_PROC
        bool "ST-RAM statistics in /proc"
        depends on ATARI
        help
 config STRAM_PROC
        bool "ST-RAM statistics in /proc"
        depends on ATARI
        help

-         Say Y here to report ST-RAM usage statistics in /proc/stram.  See
-         the help for CONFIG_STRAM_SWAP for discussion of ST-RAM and its
-         uses.
+         Say Y here to report ST-RAM usage statistics in /proc/stram.

 
 config HEARTBEAT
        bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40
 
 config HEARTBEAT
        bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40


@@ -448,6 +445,8 @@ source "drivers/zorro/Kconfig"
 
 endmenu
 
 
 endmenu
 

+source "net/Kconfig"
+

 source "drivers/Kconfig"
 
 menu "Character devices"
 source "drivers/Kconfig"
 
 menu "Character devices"


@@ -609,7 +608,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