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

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

Merge "msm: ipa: move rndis_ipa and ecm_ipa to ipa folder"

parents 593b8e5d a1ecfd66

arch/arm/configs/sdxpoorwills-perf_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -175,8 +175,6 @@ CONFIG_TUN=y 
# CONFIG_NET_VENDOR_INTEL is not set

CONFIG_KS8851=y

# CONFIG_NET_VENDOR_MICROCHIP is not set

CONFIG_ECM_IPA=y

CONFIG_RNDIS_IPA=y

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set
@@ -270,6 +268,8 @@ CONFIG_UIO=y 
CONFIG_STAGING=y

CONFIG_GSI=y

CONFIG_IPA3=y

CONFIG_ECM_IPA=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

arch/arm/configs/sdxpoorwills_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ CONFIG_TUN=y 
# CONFIG_NET_VENDOR_INTEL is not set

CONFIG_KS8851=y

# CONFIG_NET_VENDOR_MICROCHIP is not set

CONFIG_ECM_IPA=y

CONFIG_RNDIS_IPA=y

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set
@@ -266,6 +264,8 @@ CONFIG_UIO=y 
CONFIG_STAGING=y

CONFIG_GSI=y

CONFIG_IPA3=y

CONFIG_ECM_IPA=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

arch/arm64/configs/sdm845-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ CONFIG_BONDING=y 
CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_SKY2=y

CONFIG_RNDIS_IPA=y

CONFIG_SMSC911X=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y
@@ -443,6 +442,7 @@ CONFIG_ION_MSM=y 
CONFIG_GSI=y

CONFIG_IPA3=y

CONFIG_RMNET_IPA3=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

arch/arm64/configs/sdm845_defconfig

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

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_RNDIS_IPA=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y
@@ -459,6 +458,7 @@ CONFIG_ION_MSM=y 
CONFIG_GSI=y

CONFIG_IPA3=y

CONFIG_RMNET_IPA3=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

drivers/net/ethernet/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ source "drivers/net/ethernet/mellanox/Kconfig" 
source "drivers/net/ethernet/micrel/Kconfig"

source "drivers/net/ethernet/microchip/Kconfig"

source "drivers/net/ethernet/moxa/Kconfig"

source "drivers/net/ethernet/msm/Kconfig"

source "drivers/net/ethernet/myricom/Kconfig"



config FEALNX