diff -urN linux-2.4.33/Documentation/Configure.help linux-2.4.33-skge-1/Documentation/Configure.help --- linux-2.4.33/Documentation/Configure.help 2006-03-01 00:01:47 +0100 +++ linux-2.4.33-skge-1/Documentation/Configure.help 2006-10-23 16:08:21 +0200 @@ -12140,6 +12140,35 @@ say M here and read Documentation/modules.txt. This is recommended. The module will be called sk98lin.o. +Marvell Yukon Gigabit Ethernet Adapter family support +CONFIG_SKGE + This is an alternate driver for the Marvell Yukon Gigabit Ethernet + family. It is a backport of version 1.6 for kernel 2.6. The vendor's + one is recommended (sk98lin), but under some circumstances, it is + known to have trouble (eg: sending UDP only on old chips). This driver + is not very fast an may lead to higher CPU loads than the original one, + but at least it is reported to work. Linking it with the kernel is not + recommended since it may conflict with sk98lin. + + If you want to compile this driver as a module ( = code which can be + inserted in and removed from the running kernel whenever you want), + say M here and read Documentation/modules.txt. This is recommended. + The module will be called skge.o. + +Marvell Yukon 2 Gigabit Ethernet Adapter family support +CONFIG_SKY2 + This is an alternate driver for the Marvell Yukon 2 Gigabit Ethernet + family. It is a backport of version 1.5 for kernel 2.6. The vendor's + one is recommended (sk98lin), but under some circumstances, it is + known to have trouble (eg: sending UDP only on old chips). This driver + is not very fast an may lead to higher CPU loads than the original one, + but at least it is reported to work. Linking it with the kernel is not + recommended since it may conflict with sk98lin. + + If you want to compile this driver as a module ( = code which can be + inserted in and removed from the running kernel whenever you want), + say M here and read Documentation/modules.txt. This is recommended. + The module will be called sky2.o. Sun GEM support CONFIG_SUNGEM diff -urN linux-2.4.33/drivers/net/Config.in linux-2.4.33-skge-1/drivers/net/Config.in --- linux-2.4.33/drivers/net/Config.in 2005-01-27 18:57:32 +0100 +++ linux-2.4.33-skge-1/drivers/net/Config.in 2006-10-23 16:07:21 +0200 @@ -272,6 +272,10 @@ if [ "$CONFIG_SIBYTE_SB1xxx_SOC" = "y" ]; then tristate 'SB1250 Ethernet support' CONFIG_NET_SB1250_MAC fi + +dep_tristate 'Alternate Marvell Yukon Chipset Support (not Yukon2)' CONFIG_SKGE $CONFIG_PCI +dep_tristate 'Alternate Marvell Yukon 2 Chipset Support' CONFIG_SKY2 $CONFIG_PCI + dep_tristate 'Marvell Yukon Chipset / SysKonnect SK-98xx Support' CONFIG_SK98LIN $CONFIG_PCI dep_tristate 'Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI diff -urN linux-2.4.33/drivers/net/Makefile linux-2.4.33-skge-1/drivers/net/Makefile --- linux-2.4.33/drivers/net/Makefile 2005-01-27 18:57:32 +0100 +++ linux-2.4.33-skge-1/drivers/net/Makefile 2006-10-23 16:07:21 +0200 @@ -108,6 +108,16 @@ obj-y += skfp/skfp.o endif +subdir-$(CONFIG_SKGE) += skge +ifeq ($(CONFIG_SKGE),y) + obj-y += skge/skge.o +endif + +subdir-$(CONFIG_SKY2) += skge +ifeq ($(CONFIG_SKY2),y) + obj-y += skge/sky2.o +endif + obj-$(CONFIG_VIA_RHINE) += via-rhine.o mii.o obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o mii.o diff -urN linux-2.4.33/drivers/net/skge/Makefile linux-2.4.33-skge-1/drivers/net/skge/Makefile --- linux-2.4.33/drivers/net/skge/Makefile 1970-01-01 01:00:00 +0100 +++ linux-2.4.33-skge-1/drivers/net/skge/Makefile 2006-10-23 16:09:20 +0200 @@ -0,0 +1,14 @@ +# +# Makefile for the Marvell Yukon/Yukon2 Gigabit Ethernet Chips +# +O_TARGET := net_skge.o +obj-y := +obj-m := +obj-n := +obj- := + +obj-$(CONFIG_SKGE) += skge.o +obj-$(CONFIG_SKY2) += sky2.o + +include $(TOPDIR)/Rules.make +