From c22d86362d7219bc60afbff0df72901b60bff171 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Wed, 6 Jul 2011 13:13:15 +0000
Subject: [PATCH] --- yaml --- r: 259160 b: refs/heads/master c:
 241590c35fc08230f80dde82920dae0f2f3d6d41 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/configs/ppc64_defconfig | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1c104604381a..541817a79ff4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29cd9913942a56cce612e0821fec976f29bc1e9b
+refs/heads/master: 241590c35fc08230f80dde82920dae0f2f3d6d41
diff --git a/trunk/arch/powerpc/configs/ppc64_defconfig b/trunk/arch/powerpc/configs/ppc64_defconfig
index b4398e432822..f349823a12ad 100644
--- a/trunk/arch/powerpc/configs/ppc64_defconfig
+++ b/trunk/arch/powerpc/configs/ppc64_defconfig
@@ -446,7 +446,6 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_LATENCYTOP=y
 CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_IRQSOFF_TRACER=y
 CONFIG_SCHED_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_DEBUG_STACKOVERFLOW=y