Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[pandora-kernel.git] / arch / s390 / Kconfig.debug

diff --git a/arch/s390/Kconfig.debug b/arch/s390/Kconfig.debug
index 05221b1..2b380df 100644 (file)
--- a/arch/s390/Kconfig.debug
+++ b/arch/s390/Kconfig.debug
@@ -1,8 +1,7 @@
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
-       bool
-       default y
+       def_bool y
 
 source "lib/Kconfig.debug"
 
@@ -19,7 +18,8 @@ config STRICT_DEVMEM
          If you are unsure, say Y.
 
 config DEBUG_STRICT_USER_COPY_CHECKS
-       bool "Strict user copy size checks"
+       def_bool n
+       prompt "Strict user copy size checks"
        ---help---
          Enabling this option turns a certain set of sanity checks for user
          copy operations into compile time warnings.