]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - arch/m32r/Kconfig
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[karo-tx-linux.git] / arch / m32r / Kconfig
index f57113f1f892b091e7439ee18448459b6df25678..29047d5c259aa9a2f9622bf15f9baa1e3d21dfcc 100644 (file)
@@ -36,15 +36,14 @@ config NO_IOPORT
 config NO_DMA
        def_bool y
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 config HZ
        int
        default 100
 
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 
 menu "Processor type and features"
 
@@ -274,7 +273,7 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config SCHED_NO_NO_OMIT_FRAME_POINTER
+config SCHED_OMIT_FRAME_POINTER
         bool
         default y