From eafd4131c8c473c30232d1bb1035aee5a2802c6f Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 4 Dec 2006 15:39:52 +0100
Subject: [PATCH] --- yaml --- r: 42017 b: refs/heads/master c:
 feb5babead7f8058f0108ec59c3e7c2df666bd67 h: refs/heads/master i:   42015:
 c1feeff98d6b1383acdfda0de3abc363e23d42c7 v: v3

---
 [refs]                  | 2 +-
 trunk/arch/s390/Kconfig | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

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