diff --git a/[refs] b/[refs]
index fcb2386ff588..3c376c4eef73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2af0bc94a665f22975de11bddcf6c57907ce8255
+refs/heads/master: e87be1143472d841c1907e6e7ae4862a30e3595c
diff --git a/trunk/arch/arm26/Kconfig b/trunk/arch/arm26/Kconfig
index 989113dce415..20688bc13e9b 100644
--- a/trunk/arch/arm26/Kconfig
+++ b/trunk/arch/arm26/Kconfig
@@ -57,9 +57,6 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
-config GENERIC_BUST_SPINLOCK
-	bool
-
 config ZONE_DMA
 	bool
 	default y