diff --git a/[refs] b/[refs]
index efb1122434d6..f90b566abed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09a4df5f0c8b7c418821fe591bf0d0f13b206c61
+refs/heads/master: c167aeef232c45deaf5c6c9be00a1f71b14962d3
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 51bccbc554cf..a8693edd4f43 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -570,11 +570,6 @@ config NR_CPUS
 
 source "kernel/Kconfig.preempt"
 
-config NODES_SHIFT
-	int
-	default "1"
-	depends on NEED_MULTIPLE_NODES
-
 endmenu
 
 menu "Boot options"