ARM: 6140/1: silence a bogus sparse warning in unwind.c

[safe/jmp/linux-2.6] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index c56af4b..b5da298 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -58,10 +58,18 @@ config HZ
        int
        default 100
 
+config GENERIC_TIME
+       def_bool y
+
+config ARCH_USES_GETTIMEOFFSET
+       def_bool y
+
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 menu "Platform dependent setup"
 
 config EISA
@@ -122,23 +130,6 @@ config ATARI
          this kernel on an Atari, say Y here and browse the material
          available in <file:Documentation/m68k>; otherwise say N.
 
-config HADES
-       bool "Hades support"
-       depends on ATARI && BROKEN
-       help
-         This option enables support for the Hades Atari clone. If you plan
-         to use this kernel on a Hades, say Y here; otherwise say N.
-
-config PCI
-       bool
-       depends on HADES
-       default y
-       help
-         Find out whether you have a PCI motherboard. PCI is the name of a
-         bus system, i.e. the way the CPU talks to the other stuff inside
-         your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
-         VESA. If you have PCI, say Y, otherwise N.
-
 config MAC
        bool "Macintosh support"
        select MMU_MOTOROLA if MMU
@@ -295,7 +286,6 @@ config M68060
 
 config MMU_MOTOROLA
        bool
-       depends on MMU && !MMU_SUN3
 
 config MMU_SUN3
        bool
@@ -319,7 +309,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
@@ -546,10 +536,6 @@ config GVPIOEXT_PLIP
          Say Y to enable doing IP over the parallel port on your GVP
          IO-Extender card, N otherwise.
 
-config MAC_SCC
-       tristate "Macintosh serial support"
-       depends on MAC
-
 config MAC_HID
        bool
        depends on INPUT_ADBHID
@@ -571,7 +557,7 @@ config HPAPCI
 
 config MVME147_SCC
        bool "SCC support for MVME147 serial ports"
-       depends on MVME147
+       depends on MVME147 && BROKEN
        help
          This is the driver for the serial ports on the Motorola MVME147
          boards.  Everyone using one of these boards should say Y here.
@@ -586,14 +572,14 @@ config SERIAL167
 
 config MVME162_SCC
        bool "SCC support for MVME162 serial ports"
-       depends on MVME16x
+       depends on MVME16x && BROKEN
        help
          This is the driver for the serial ports on the Motorola MVME162 and
          172 boards.  Everyone using one of these boards should say Y here.
 
 config BVME6000_SCC
        bool "SCC support for BVME6000 serial ports"
-       depends on BVME6000
+       depends on BVME6000 && BROKEN
        help
          This is the driver for the serial ports on the BVME4000 and BVME6000
          boards from BVM Ltd.  Everyone using one of these boards should say
@@ -605,7 +591,7 @@ config DN_SERIAL
 
 config SERIAL_CONSOLE
        bool "Support for serial port console"
-       depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
+       depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
        ---help---
          If you say Y here, it will be possible to use a serial port as the
          system console (the system console is the device which receives all