diff --git a/[refs] b/[refs]
index 0c9e9b574c5d..8e2d7def1bc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01376f4495840f3daf6d73679242b5964fc9603b
+refs/heads/master: feb5babead7f8058f0108ec59c3e7c2df666bd67
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 245b81bc7157..5b04c4095c8d 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -33,9 +33,6 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_TIME
 	def_bool y
 
-config GENERIC_BUST_SPINLOCK
-	bool
-
 mainmenu "Linux Kernel Configuration"
 
 config S390