commit cf4adb827e5da68daf6a631ea18aa1548a469507
author Stewart Smith <stewart@linux.ibm.com> Wed Apr 03 08:21:09 2019 +1100
committer GitHub <noreply@github.com> Wed Apr 03 08:21:09 2019 +1100
tree 892fc74da047d1fe0fbc35edbfd6d489f652e6d3
parent e4b14650e3e99cd2253ba0bb0d99335de1cc83ee
parent 993e6ff6d17d44f557e7ef7ed66770f942015dc1

Merge pull request #2561 from legoater/master

linux: config: Add Intel E1000e

doc/boot-devices.rst

diff --git a/doc/boot-devices.rst b/doc/boot-devices.rst
index 1f08da1..da2fd5b 100644
--- a/doc/boot-devices.rst
+++ b/doc/boot-devices.rst
@@ -35,6 +35,7 @@
 +-------------------------------+-----------------------+--------+----------------------------+
 | Exar Xframe 10Gb              | S2IO                  |        |                            |
 +-------------------------------+-----------------------+--------+----------------------------+
+| Intel PRO/1000 PCIe           | E1000E                |        |                            |
 | Intel PRO/1000                | E1000                 | Qemu   | stewart@linux.vnet.ibm.com |
 +-------------------------------+-----------------------+--------+----------------------------+
 | Intel PRO/10GbE               | IXGB                  |        |                            |

openpower/configs/linux/skiroot_defconfig

diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 3205788..999fc61 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -154,6 +154,7 @@
 # CONFIG_NET_VENDOR_HP is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
 CONFIG_E1000=m
+CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m