diff --git a/[refs] b/[refs]
index 46e1247f6e20..2a43a93d9e23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d00677255077c3b085a32c1a104fc42a64d17e6f
+refs/heads/master: ced238f35b2dc9a0c53d0045ec42d818444946b8
diff --git a/trunk/arch/sh64/Kconfig.debug b/trunk/arch/sh64/Kconfig.debug
index 26d842c07139..f3355ce6647e 100644
--- a/trunk/arch/sh64/Kconfig.debug
+++ b/trunk/arch/sh64/Kconfig.debug
@@ -32,13 +32,4 @@ config SH_ALPHANUMERIC
 config SH_NO_BSS_INIT
 	bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"
 
-config FRAME_POINTER
-	bool "Compile the kernel with frame pointers"
-	default y if KGDB
-	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.
-
 endmenu