oprofile/x86: reordering some functions

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

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index bfd3530..064f591 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -14,6 +14,11 @@ config MMU
        bool
        default n
 
+config NO_DMA
+       bool
+       depends on !COLDFIRE
+       default y
+
 config FPU
        bool
        default n
@@ -42,6 +47,10 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
+config GENERIC_GPIO
+       bool
+       default n
+
 config GENERIC_HWEIGHT
        bool
        default y
@@ -66,14 +75,17 @@ config TIME_LOW_RES
        bool
        default y
 
-config NO_IOPORT
-       def_bool y
+config GENERIC_CLOCKEVENTS
+       bool
+       default n
 
-config ARCH_SUPPORTS_AOUT
+config NO_IOPORT
        def_bool y
 
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 menu "Processor type and features"
 
 choice
@@ -112,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
 
@@ -142,6 +156,7 @@ config M5275
 
 config M528x
        bool "MCF528x"
+       select GENERIC_CLOCKEVENTS
        help
          Motorola ColdFire 5280/5282 processor support.
 
@@ -165,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
@@ -391,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
@@ -521,6 +533,13 @@ config AVNET
        default y
        depends on (AVNET5282)
 
+config UBOOT
+       bool "Support for U-Boot command line parameters"
+       help
+         If you say Y here kernel will try to collect command
+         line parameters from the initial u-boot stack.
+       default n
+
 config 4KSTACKS
        bool "Use 4Kb for kernel stacks instead of 8Kb"
        default y
@@ -678,6 +697,9 @@ endchoice
 if COLDFIRE
 source "kernel/Kconfig.preempt"
 endif
+
+source "kernel/time/Kconfig"
+
 source "mm/Kconfig"
 
 endmenu
@@ -687,25 +709,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"