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

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

Merge "net: qfec: Populate qfec driver from 3.4 branch to 3.10 branch"

parents e3a543d6 03bbc770

drivers/net/ethernet/msm/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -85,3 +85,12 @@ config RNDIS_IPA 
	  host using the RNDIS protocol.

	  This Network interface is aimed to allow data path go through

	  IPA core while using RNDIS protocol.



config QFEC

	tristate "QFEC ethernet driver"

	select MII

	depends on ARM

	help

	  This driver supports Ethernet in the FSM9xxx.

	  To compile this driver as a module, choose M here: the

	  module will be called qfec.

drivers/net/ethernet/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ obj-$(CONFIG_MSM_RMNET_MHI) += msm_rmnet_mhi.o 
obj-$(CONFIG_MSM_RMNET_SMUX) += msm_rmnet_smux.o

obj-$(CONFIG_ECM_IPA) += ecm_ipa.o

obj-$(CONFIG_RNDIS_IPA) += rndis_ipa.o

obj-$(CONFIG_QFEC) += qfec.o

drivers/net/ethernet/msm/qfec.c

0 → 100644
+2974 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/msm/qfec.h

0 → 100644
+782 −0

File added.

Preview size limit exceeded, changes collapsed.