Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-drm-fsl-dcu.git] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index d391d11f245ab0d8d06ce6a9e92c95a1b4b989f8..f75a686ba6443d7ed3853c9afcdbbc6eeaaa83a8 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -26,6 +26,14 @@ config MMU
        bool
        default y
 
+config STACKTRACE_SUPPORT
+       bool
+       default y
+
+config LOCKDEP_SUPPORT
+       bool
+       default y
+
 config TIME_INTERPOLATION
        bool
        default y
@@ -224,10 +232,6 @@ config LARGE_ALLOCS
 
 source "mm/Kconfig"
 
-config GENERIC_ISA_DMA
-       bool
-       default y
-
 config ISA
        bool
        help