upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 3b753a8..244207a 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -29,6 +29,10 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default n
 
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
 source "init/Kconfig"
 
 menu "Processor type and features"
@@ -328,12 +332,6 @@ config COBRA5272
        help
          Support for the senTec COBRA5272 board.
 
-config M5275EVB
-       bool "Freescale (Motorola) M5275EVB board support"
-       depends on M527x
-       help
-         Support for the Freescale (Motorola) M5275EVB board.
-
 config M5282EVB
        bool "Motorola M5282EVB board support"
        depends on M528x
@@ -448,7 +446,7 @@ config SNEHA
         bool
        default y
        depends on CPU16B
-       
+
 config LARGE_ALLOCS
        bool "Allow allocating large blocks (> 1MB) of memory"
        help
@@ -532,15 +530,15 @@ config ROMKERNEL
        help
          The kernel will be resident in FLASH/ROM when running.
 
-config HIMEMKERNEL
-       bool "HIMEM"
-       help
-         The kernel will be resident in high memory when running.
-
 endchoice
 
 endmenu
 
+config ISA_DMA_API
+       bool
+       depends on !M5272
+       default y
+
 menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
 
 config PCI