diff --git a/[refs] b/[refs]
index 9088ceda2f30..f6e1eb82ba88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59df6bbf386d8f26870b28307d0e4f06d631685f
+refs/heads/master: 7e06066b87ffd2c7a7f4c3f1c612293307270976
diff --git a/trunk/arch/sh64/Kconfig b/trunk/arch/sh64/Kconfig
index 4c3e5334adb3..fb35b45dc130 100644
--- a/trunk/arch/sh64/Kconfig
+++ b/trunk/arch/sh64/Kconfig
@@ -29,10 +29,6 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
-config LOG_BUF_SHIFT
-	int
-	default 14
-
 config RWSEM_XCHGADD_ALGORITHM
 	bool