From ba1bc0e2edd64c5de740f0c9ca9c309d2e914d56 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Mon, 6 Aug 2012 18:43:42 +0100
Subject: [PATCH] --- yaml --- r: 321805 b: refs/heads/master c:
 f1898f6be9a2e3690fb62d8307849b86a89cc36c h: refs/heads/master i:   321803:
 ac69e11b193bb8bce7a554a6626c52e2676c2b83 v: v3

---
 [refs]                 | 2 +-
 trunk/arch/arm/Kconfig | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4104128226f0..5f2bb837e060 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d9fb0038a9b02febb01efc79a4a5d97f1822a90
+refs/heads/master: f1898f6be9a2e3690fb62d8307849b86a89cc36c
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index e91c7cdc6fe5..e4191ccbdb7a 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -126,11 +126,6 @@ config TRACE_IRQFLAGS_SUPPORT
 	bool
 	default y
 
-config GENERIC_LOCKBREAK
-	bool
-	default y
-	depends on SMP && PREEMPT
-
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y