| commit | 38bf66e0f78c34ab18f5deebf8171c92ace511ab | [log] [tgz] |
|---|---|---|
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | Mon Aug 01 16:56:21 2016 +1000 |
| committer | GitHub <noreply@github.com> | Mon Aug 01 16:56:21 2016 +1000 |
| tree | 04673ae1e26fb2649c2009c65a70f716dd15663d | |
| parent | b4a848572dd23e522c370f58556c4c533a9dcd20 [diff] | |
| parent | e76515434c0b83acf4bfba467a4940e10c6ac67f [diff] |
Merge pull request #558 from stewart-ibm/disable-mlx5 disable mlx5 driver in skiroot_defconfig
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