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

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

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index f4b582c..e2201b9 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -8,11 +8,17 @@ mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"
 config M68K
        bool
        default y
+       select HAVE_IDE
 
 config MMU
        bool
        default n
 
+config NO_DMA
+       bool
+       depends on !COLDFIRE
+       default y
+
 config FPU
        bool
        default n
@@ -41,6 +47,10 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
+config GENERIC_GPIO
+       bool
+       default n
+
 config GENERIC_HWEIGHT
        bool
        default y
@@ -53,15 +63,29 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config GENERIC_TIME
+       bool
+       default y
+
+config GENERIC_CMOS_UPDATE
+       bool
+       default y
+
 config TIME_LOW_RES
        bool
        default y
 
+config GENERIC_CLOCKEVENTS
+       bool
+       default n
+
 config NO_IOPORT
        def_bool y
 
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 menu "Processor type and features"
 
 choice
@@ -100,11 +124,13 @@ config M5206e
 
 config M520x
        bool "MCF520x"
+       select GENERIC_CLOCKEVENTS
        help
           Freescale Coldfire 5207/5208 processor support.
 
 config M523x
        bool "MCF523x"
+       select GENERIC_CLOCKEVENTS
        help
          Freescale Coldfire 5230/1/2/4/5 processor support
 
@@ -130,6 +156,7 @@ config M5275
 
 config M528x
        bool "MCF528x"
+       select GENERIC_CLOCKEVENTS
        help
          Motorola ColdFire 5280/5282 processor support.
 
@@ -153,11 +180,14 @@ endchoice
 config M527x
        bool
        depends on (M5271 || M5275)
+       select GENERIC_CLOCKEVENTS
        default y
 
 config COLDFIRE
        bool
        depends on (M5206 || M5206e || M520x || M523x || M5249 || M527x || M5272 || M528x || M5307 || M532x || M5407)
+       select GENERIC_GPIO
+       select ARCH_REQUIRE_GPIOLIB
        default y
 
 config CLOCK_SET
@@ -379,12 +409,6 @@ config M5307C3
        help
          Support for the Motorola M5307C3 board.
 
-config eLIA
-       bool "Moreton Bay eLIA board support"
-       depends on M5307
-       help
-         Support for the Moreton Bay eLIA board.
-
 config SECUREEDGEMP3
        bool "SnapGear SecureEdge/MP3 platform support"
        depends on M5307
@@ -518,6 +542,11 @@ config 4KSTACKS
          running more threads on a system and also reduces the pressure
          on the VM subsystem for higher order allocations.
 
+config HZ
+       int
+       default 1000 if CLEOPATRA
+       default 100
+
 comment "RAM configuration"
 
 config RAMBASE
@@ -658,6 +687,12 @@ config ROMKERNEL
 
 endchoice
 
+if COLDFIRE
+source "kernel/Kconfig.preempt"
+endif
+
+source "kernel/time/Kconfig"
+
 source "mm/Kconfig"
 
 endmenu
@@ -667,25 +702,8 @@ config ISA_DMA_API
        depends on !M5272
        default y
 
-menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
-
-config PCI
-       bool "PCI support"
-       help
-         Support for PCI bus.
-
-config COMEMPCI
-       bool "CO-MEM lite PCI controller support"
-       depends on (M5307 || M5407)
-
-source "drivers/pci/Kconfig"
-
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
-endmenu
-
 menu "Executable file formats"
 
 source "fs/Kconfig.binfmt"
@@ -707,8 +725,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/m68knommu/Kconfig.debug"
 
 source "security/Kconfig"