From f2acd49d42df205c144c620dbd84b23be70951f2 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Sat, 5 Mar 2011 02:00:26 +0000 Subject: [PATCH] --- yaml --- r: 243521 b: refs/heads/master c: 23c621104360b71fd6d713142a24e6583418c3e1 h: refs/heads/master i: 243519: ad9ed421ac852fc3d3d0f6175a108befb6d33374 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/configs/pseries_defconfig | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e8cefbed1159..5b73498e053f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84493804bbbc10291492661440728668b2b06abe +refs/heads/master: 23c621104360b71fd6d713142a24e6583418c3e1 diff --git a/trunk/arch/powerpc/configs/pseries_defconfig b/trunk/arch/powerpc/configs/pseries_defconfig index 9c3f22c6cde1..249ddd0a27cd 100644 --- a/trunk/arch/powerpc/configs/pseries_defconfig +++ b/trunk/arch/powerpc/configs/pseries_defconfig @@ -189,6 +189,7 @@ CONFIG_TIGON3=y CONFIG_BNX2=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m CONFIG_EHEA=y CONFIG_IXGBE=m CONFIG_IXGB=m @@ -255,6 +256,8 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_EHCA=m +CONFIG_INFINIBAND_CXGB3=m +CONFIG_INFINIBAND_CXGB4=m CONFIG_MLX4_INFINIBAND=m CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_IPOIB_CM=y