diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-04 13:14:15 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-04 13:14:15 -0500 |
| commit | 432f3aca12cbf3488ac5dfb66f5fd1b761756dbc (patch) | |
| tree | 3b9c707bd40de7236a857c5cb0b20fb594ea25a5 | |
| parent | 9633911b5635f00cb29de62348f874aaaa05274e (diff) | |
| download | kernel-432f3aca12cbf3488ac5dfb66f5fd1b761756dbc.tar.gz kernel-432f3aca12cbf3488ac5dfb66f5fd1b761756dbc.tar.xz kernel-432f3aca12cbf3488ac5dfb66f5fd1b761756dbc.zip | |
Enable MLX4_EN on ppc64/aarch64 (rhbz 1198719)
| -rw-r--r-- | config-arm64 | 4 | ||||
| -rw-r--r-- | config-powerpc-generic | 3 | ||||
| -rw-r--r-- | kernel.spec | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/config-arm64 b/config-arm64 index 316b2e62d..5ad900f8c 100644 --- a/config-arm64 +++ b/config-arm64 @@ -146,6 +146,10 @@ CONFIG_AMD_XGBE=m CONFIG_AMD_XGBE_PHY=m # CONFIG_AMD_XGBE_DCB is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y + # CONFIG_IMX_THERMAL is not set CONFIG_DMI=y diff --git a/config-powerpc-generic b/config-powerpc-generic index e3dbc6a9e..af97c4964 100644 --- a/config-powerpc-generic +++ b/config-powerpc-generic @@ -210,6 +210,9 @@ CONFIG_EXTRA_TARGETS="" CONFIG_NET_VENDOR_IBM=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y + # CONFIG_SERIO_XILINX_XPS_PS2 is not set # CONFIG_PPC_SMLPAR is not set diff --git a/kernel.spec b/kernel.spec index e91cac05e..098812a6e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2216,6 +2216,9 @@ fi # # %changelog +* Wed Mar 04 2015 Josh Boyer <jwboyer@fedoraproject.org> +- Enable MLX4_EN on ppc64/aarch64 (rhbz 1198719) + * Tue Mar 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc2.git0.1 - Linux v4.0-rc2 - Enable CONFIG_CM32181 for ALS on Carbon X1 |