diff --git a/[refs] b/[refs]
index 9be875c94169..cad626c42ffd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c6337e225364870e9bf02a3ae277d9fdea483f8
+refs/heads/master: a0d6333742c68b321043e4982ec413951ee9afb0
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 34d1462e4341..52c209ef58b8 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -114,9 +114,6 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
-config GENERIC_BUST_SPINLOCK
-	bool
-
 config ARCH_MAY_HAVE_PC_FDC
 	bool