summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2011-06-27 19:55:30 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-29 09:28:52 +1000
commit937c190ccdd29855828529fc2b4b3e5f1282ff23 (patch)
treeaa00289bf6722bc26f39300124f3433c16da4702 /arch/powerpc/configs
parent82a9a4809f4cb4ce3f17da99a8150df8455fa096 (diff)
downloadop-kernel-dev-937c190ccdd29855828529fc2b4b3e5f1282ff23.zip
op-kernel-dev-937c190ccdd29855828529fc2b4b3e5f1282ff23.tar.gz
powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig
Remove duplicate assignment of SCSI_BNX2_ISCSI in pseries_defconfig introduced by: 37e0c21e powerpc/pseries: Enable iSCSI support for a number of cards causes warning: arch/powerpc/configs/pseries_defconfig:151:warning: override: reassigning to symbol SCSI_BNX2_ISCSI Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r--arch/powerpc/configs/pseries_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index c9f212b..80bc5de 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/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
OpenPOWER on IntegriCloud