| commit | 0e8d7ff2c88dc553fd226e9c08c5f394fe216cc6 | [log] [tgz] |
|---|---|---|
| author | Jay Azurin <jay.azurin@gmail.com> | Mon Aug 01 09:54:05 2016 -0500 |
| committer | GitHub <noreply@github.com> | Mon Aug 01 09:54:05 2016 -0500 |
| tree | e87b14bf557a1e45764043e27955a2afd8a6f106 | |
| parent | 38bf66e0f78c34ab18f5deebf8171c92ace511ab [diff] | |
| parent | 521e6381c3ff0c34d74e26459fc3c1884b3dfafb [diff] |
Merge pull request #559 from op-jenkins/op_update_8-1-2016 op-build update 8-1-2016
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig index bb1e33f..688524d 100644 --- a/openpower/configs/linux/skiroot_defconfig +++ b/openpower/configs/linux/skiroot_defconfig
@@ -139,8 +139,6 @@ 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