Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 99f8971716d2226a53a27c3e5c19e99c32b6f135..d211fdb24584d311884951b7f7df7c9a15b06fd9 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -27,6 +27,10 @@ config ARCH_NO_VIRT_TO_BUS
 config OF
        def_bool y
 
+config HZ
+       int
+       default 100
+
 source "init/Kconfig"
 
 menu "General machine setup"
@@ -62,7 +66,9 @@ config NR_CPUS
 config SPARC
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
+       select HAVE_ARCH_KGDB if !SMP
 
 # Identify this as a Sparc32 build
 config SPARC32
@@ -249,15 +255,6 @@ config SPARC_LED
 
 source "fs/Kconfig.binfmt"
 
-config SUNOS_EMUL
-       bool "SunOS binary emulation"
-       help
-         This allows you to run most SunOS binaries.  If you want to do this,
-         say Y here and place appropriate files in /usr/gnemul/sunos. See
-         <http://www.ultralinux.org/faq.html> for more information.  If you
-         want to run SunOS binaries on an Ultra you must also say Y to
-         "Kernel support for 32-bit a.out binaries" above.
-
 source "mm/Kconfig"
 
 endmenu