Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 7c88263256af216c2b6889481297eeb95434949c..36b4b7ab9cfb9250684e13874d6582302076d9c2 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -17,6 +17,7 @@ config SPARC64
        select HAVE_LMB
        select HAVE_ARCH_KGDB
        select USE_GENERIC_SMP_HELPERS if SMP
+       select HAVE_ARCH_TRACEHOOK
 
 config GENERIC_TIME
        bool
@@ -230,6 +231,7 @@ endmenu
 
 config NUMA
        bool "NUMA support"
+       depends on SMP
 
 config NODES_SHIFT
        int