From c71b0cd62d55435951d0ac18d5660c573252fb37 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Mon, 27 Jun 2011 19:55:30 +0000
Subject: [PATCH] --- yaml --- r: 254186 b: refs/heads/master c:
 937c190ccdd29855828529fc2b4b3e5f1282ff23 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f0d4d86faadb..512815355db1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82a9a4809f4cb4ce3f17da99a8150df8455fa096
+refs/heads/master: 937c190ccdd29855828529fc2b4b3e5f1282ff23
diff --git a/trunk/arch/powerpc/configs/pseries_defconfig b/trunk/arch/powerpc/configs/pseries_defconfig
index c9f212b5f3de..80bc5de7ee1d 100644
--- a/trunk/arch/powerpc/configs/pseries_defconfig
+++ b/trunk/arch/powerpc/configs/pseries_defconfig
@@ -148,7 +148,6 @@ CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_BE2ISCSI=m
 CONFIG_SCSI_IBMVSCSI=y
 CONFIG_SCSI_IBMVFC=m