Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 92a4f7b4323a54e0f23453e714e0a7c714bab632..9892827b6176ca5f75f250807ef5e88903f7d1a7 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -61,6 +61,7 @@ config S390
        def_bool y
        select HAVE_OPROFILE
        select HAVE_KPROBES
+       select HAVE_KRETPROBES
 
 source "init/Kconfig"
 
@@ -100,7 +101,8 @@ config NR_CPUS
        int "Maximum number of CPUs (2-64)"
        range 2 64
        depends on SMP
-       default "32"
+       default "32" if !64BIT
+       default "64" if 64BIT
        help
          This allows you to specify the maximum number of CPUs which this
          kernel will support.  The maximum supported value is 64 and the