diff --git a/[refs] b/[refs]
index f8839f5e63af..e07dd66a5bc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cdd304b20b921507fa1670aaf751496627c8d9c
+refs/heads/master: aeb39986ec8bf31c8d55eba22f0a9996363482fb
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 3754c9a8f5c8..016e89a44ac8 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -170,11 +170,11 @@ config DEBUG_FS
 
 config FRAME_POINTER
 	bool "Compile the kernel with frame pointers"
-	depends on DEBUG_KERNEL && ((X86 && !X86_64) || CRIS || M68K || M68KNOMMU || FRV || UML)
+	depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML)
 	default y if DEBUG_INFO && UML
 	help
 	  If you say Y here the resulting kernel image will be slightly larger
-	  and slower, but it will give very useful debugging information.
-	  If you don't debug the kernel, you can say N, but we may not be able
-	  to solve problems without frame pointers.
+	  and slower, but it might give very useful debugging information
+	  on some architectures or you use external debuggers.
+	  If you don't debug the kernel, you can say N.