diff --git a/[refs] b/[refs]
index 87fd4b911574..6ec01c869ce5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a0ef2923abd2cc2c6f78d3663ac7af34c0220e8
+refs/heads/master: bf4bb2b1f285ec56e7f3cbf0190761b42131871c
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
index 7a8698b913fe..4f6ed0f113f0 100644
--- a/trunk/arch/sparc/Kconfig
+++ b/trunk/arch/sparc/Kconfig
@@ -92,15 +92,9 @@ config AUDIT_ARCH
 	bool
 	default y
 
-config HAVE_LEGACY_PER_CPU_AREA
-	def_bool y if SPARC64
-
 config HAVE_SETUP_PER_CPU_AREA
 	def_bool y if SPARC64
 
-config HAVE_DYNAMIC_PER_CPU_AREA
-	def_bool y if SPARC64
-
 config GENERIC_HARDIRQS_NO__DO_IRQ
 	bool
 	def_bool y if SPARC64