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

Commit 2089a0d3 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

Automatic merge of /spare/repo/netdev-2.6 branch skge

parents 03d661d3 0b2d7fea

drivers/net/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,18 @@ config R8169_VLAN 
	  

	  If in doubt, say Y.



config SKGE

	tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"

	depends on PCI && EXPERIMENTAL

	select CRC32

	---help---

	  This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx

	  and related Gigabit Ethernet adapters. It is a new smaller driver

	  driver with better performance and more complete ethtool support.



	  It does not support the link failover and network management 

	  features that "portable" vendor supplied sk98lin driver does.

	

config SK98LIN

	tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"

	depends on PCI

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ obj-$(CONFIG_FEALNX) += fealnx.o 
obj-$(CONFIG_TIGON3) += tg3.o

obj-$(CONFIG_BNX2) += bnx2.o

obj-$(CONFIG_TC35815) += tc35815.o

obj-$(CONFIG_SKGE) += skge.o

obj-$(CONFIG_SK98LIN) += sk98lin/

obj-$(CONFIG_SKFP) += skfp/

obj-$(CONFIG_VIA_RHINE) += via-rhine.o