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

[linux-2.6] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 810755637311c425751f55e7726089d8bd3ff7db..463d1be32c98614cea3fc98cb31154895a5858eb 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -10,6 +10,7 @@ config SPARC
        default y
        select HAVE_OPROFILE
        select HAVE_KPROBES
+       select HAVE_KRETPROBES
 
 config SPARC64
        bool
@@ -41,6 +42,10 @@ config MMU
        bool
        default y
 
+config IOMMU_HELPER
+       bool
+       default y
+
 config QUICKLIST
        bool
        default y