[kernel/f22] Enable MLX4_EN on ppc64/aarch64 (rhbz 1198719)

Josh Boyer jwboyer at fedoraproject.org
Wed Mar 4 18:14:25 UTC 2015


commit 432f3aca12cbf3488ac5dfb66f5fd1b761756dbc
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Wed Mar 4 13:14:15 2015 -0500

    Enable MLX4_EN on ppc64/aarch64 (rhbz 1198719)

 config-arm64           | 4 ++++
 config-powerpc-generic | 3 +++
 kernel.spec            | 3 +++
 3 files changed, 10 insertions(+)
---
diff --git a/config-arm64 b/config-arm64
index 316b2e6..5ad900f 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 e3dbc6a..af97c49 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 e91cac0..098812a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2216,6 +2216,9 @@ fi
 #
 # 
 %changelog
+* Wed Mar 04 2015 Josh Boyer <jwboyer at fedoraproject.org>
+- Enable MLX4_EN on ppc64/aarch64 (rhbz 1198719)
+
 * Tue Mar 03 2015 Josh Boyer <jwboyer at fedoraproject.org> - 4.0.0-0.rc2.git0.1
 - Linux v4.0-rc2
 - Enable CONFIG_CM32181 for ALS on Carbon X1


More information about the scm-commits mailing list