commit 3c69277b4acabc8bbc1ce9d4f98b8eb2a4b0cb92
author e-liner <e-liner@users.noreply.github.com> Wed Jan 04 15:00:08 2017 -0600
committer GitHub <noreply@github.com> Wed Jan 04 15:00:08 2017 -0600
tree f7aa7fdc55d557f8a47d904c8b1c0cbf994ea3af
parent 815947f22a19397d54424bf4bf091e39f428ea98
parent 44f032ffce7a4214429d3e52373c1a7b0224b5f3

Merge pull request #794 from op-jenkins/op_update_05_1-4-2017

op-build update 1-4-2017

openpower/configs/linux/skiroot_defconfig

diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index afee3a2..8d0bd35 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -139,8 +139,9 @@
 CONFIG_E1000E=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
-CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
 CONFIG_MYRI10GE=m
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m