diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index e0f5e2e4..230f4977 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -842,13 +842,6 @@ config MSM7KV2_AUDIO
           Enables QDSP5V2-based audio drivers for audio playbacks and
           voice call.
 
-config MSM_QDSP6
-	tristate "QDSP6 support"
-	depends on ARCH_QSD8X50
-	default n
-	help
-	  Enable support for qdsp6. This provides audio and video functionality.
-
 config MSM_CLOCK_CTRL_DEBUG
 	bool "Enable debugfs interface for clock control"
 	default n
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 234ceb10..c5b9b327 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -545,7 +545,7 @@ config DEBUG_LOCKING_API_SELFTESTS
 	  mutexes and rwsems.
 
 config STACKTRACE
-	bool
+	bool "Stacktrace"
 	depends on STACKTRACE_SUPPORT
 
 config DEBUG_KOBJECT