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

Commit d5df7c41 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next

parents 80703d26 cd2d5b52

drivers/net/ethernet/sfc/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -26,3 +26,11 @@ config SFC_MCDI_MON 
	----help---

	----help---

	  This exposes the on-board firmware-managed sensors as a

	  This exposes the on-board firmware-managed sensors as a

	  hardware monitor device.

	  hardware monitor device.

config SFC_SRIOV

	bool "Solarflare SFC9000-family SR-IOV support"

	depends on SFC && PCI_IOV

	default y

	---help---

	  This enables support for the SFC9000 I/O Virtualization

	  features, allowing accelerated network performance in

	  virtualized environments.

drivers/net/ethernet/sfc/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,5 +4,6 @@ sfc-y += efx.o nic.o falcon.o siena.o tx.o rx.o filter.o \ 
			   tenxpress.o txc43128_phy.o falcon_boards.o \

			   tenxpress.o txc43128_phy.o falcon_boards.o \

			   mcdi.o mcdi_phy.o mcdi_mon.o

			   mcdi.o mcdi_phy.o mcdi_mon.o

sfc-$(CONFIG_SFC_MTD)	+= mtd.o

sfc-$(CONFIG_SFC_MTD)	+= mtd.o

sfc-$(CONFIG_SFC_SRIOV)	+= siena_sriov.o





obj-$(CONFIG_SFC)	+= sfc.o
 
obj-$(CONFIG_SFC)	+= sfc.o