Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18a1cc44 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: defconfig: enable Intel NIC E1000E driver for MSM8996AU"

parents 25a44826 ed71c9e4

arch/arm64/configs/msm-auto-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_E1000E=y

CONFIG_RNDIS_IPA=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y
@@ -322,7 +323,6 @@ CONFIG_SOUNDWIRE=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=y

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_MSM8996=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

arch/arm64/configs/msm-auto_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_E1000E=y

CONFIG_RNDIS_IPA=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y
@@ -325,7 +326,6 @@ CONFIG_SOUNDWIRE=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=y

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_MSM8996=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y