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

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

Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

Conflicts:

	drivers/s390/net/qeth_main.c
parents 817bc4db ef850045

Documentation/feature-removal-schedule.txt

+0 −10
Original line number Diff line number Diff line
@@ -213,14 +213,6 @@ Who: linuxppc-dev@ozlabs.org 


---------------------------



What:   sk98lin network driver

When:   Feburary 2008

Why:    In kernel tree version of driver is unmaintained. Sk98lin driver

	replaced by the skge driver. 

Who:    Stephen Hemminger <shemminger@linux-foundation.org>



---------------------------



What:	i386/x86_64 bzImage symlinks

When:	April 2008
@@ -231,8 +223,6 @@ Who: Thomas Gleixner <tglx@linutronix.de> 


---------------------------



---------------------------



What:	i2c-i810, i2c-prosavage and i2c-savage4

When:	May 2008

Why:	These drivers are superseded by i810fb, intelfb and savagefb.

arch/s390/defconfig

+3 −5
Original line number Diff line number Diff line
@@ -537,11 +537,9 @@ CONFIG_CTC=m 
# CONFIG_SMSGIUCV is not set

# CONFIG_CLAW is not set

CONFIG_QETH=y



#

# Gigabit Ethernet default settings

#

# CONFIG_QETH_IPV6 is not set

CONFIG_QETH_L2=y

CONFIG_QETH_L3=y

CONFIG_QETH_IPV6=y

CONFIG_CCWGROUP=y

# CONFIG_PPP is not set

# CONFIG_SLIP is not set

drivers/net/8390.c

+4 −2
Original line number Diff line number Diff line
@@ -48,14 +48,16 @@ EXPORT_SYMBOL(__alloc_ei_netdev); 


#if defined(MODULE)



int init_module(void)

static int __init ns8390_module_init(void)

{

	return 0;

}



void cleanup_module(void)

static void __exit ns8390_module_exit(void)

{

}



module_init(ns8390_init_module);

module_exit(ns8390_module_exit);

#endif /* MODULE */

MODULE_LICENSE("GPL");

drivers/net/Kconfig

+0 −87
Original line number Diff line number Diff line
@@ -2220,93 +2220,6 @@ config SKY2_DEBUG 


	 If unsure, say N.



config SK98LIN

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

	depends on PCI

	---help---

	  Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx

	  compliant Gigabit Ethernet Adapter.



	  This driver supports the original Yukon chipset. This driver is

	  deprecated and will be removed from the kernel in the near future,

	  it has been replaced by the skge driver. skge is cleaner and

	  seems to work better.



	  This driver does not support the newer Yukon2 chipset. A separate

	  driver, sky2, is provided to support Yukon2-based adapters.



	  The following adapters are supported by this driver:

	    - 3Com 3C940 Gigabit LOM Ethernet Adapter

	    - 3Com 3C941 Gigabit LOM Ethernet Adapter

	    - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter

	    - Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter

	    - Allied Telesyn AT-2970SX Gigabit Ethernet Adapter

	    - Allied Telesyn AT-2970SX/2SC Gigabit Ethernet Adapter

	    - Allied Telesyn AT-2970TX Gigabit Ethernet Adapter

	    - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter

	    - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter

	    - Allied Telesyn AT-2971T Gigabit Ethernet Adapter

	    - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45

	    - EG1032 v2 Instant Gigabit Network Adapter

	    - EG1064 v2 Instant Gigabit Network Adapter

	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)

	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron)

	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus)

	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)

	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox)

	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)

	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)

	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)

	    - Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel)

	    - Marvell RDK-8001 Adapter

	    - Marvell RDK-8002 Adapter

	    - Marvell RDK-8003 Adapter

	    - Marvell RDK-8004 Adapter

	    - Marvell RDK-8006 Adapter

	    - Marvell RDK-8007 Adapter

	    - Marvell RDK-8008 Adapter

	    - Marvell RDK-8009 Adapter

	    - Marvell RDK-8010 Adapter

	    - Marvell RDK-8011 Adapter

	    - Marvell RDK-8012 Adapter

	    - Marvell RDK-8052 Adapter

	    - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)

	    - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)

	    - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)

	    - SK-9521 10/100/1000Base-T Adapter

	    - SK-9521 V2.0 10/100/1000Base-T Adapter

	    - SK-9821 Gigabit Ethernet Server Adapter (SK-NET GE-T)

	    - SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter

	    - SK-9822 Gigabit Ethernet Server Adapter (SK-NET GE-T dual link)

	    - SK-9841 Gigabit Ethernet Server Adapter (SK-NET GE-LX)

	    - SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter

	    - SK-9842 Gigabit Ethernet Server Adapter (SK-NET GE-LX dual link)

	    - SK-9843 Gigabit Ethernet Server Adapter (SK-NET GE-SX)

	    - SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter

	    - SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link)

	    - SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter

	    - SK-9861 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition)

	    - SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter

	    - SK-9862 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition dual link)

	    - SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX)

	    - SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter

	    - SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link)

	    - SMC EZ Card 1000 (SMC9452TXV.2)

	  

	  The adapters support Jumbo Frames.

	  The dual link adapters support link-failover and dual port features.

	  Both Marvell Yukon and SysKonnect SK-98xx/SK-95xx adapters support 

	  the scatter-gather functionality with sendfile(). Please refer to 

	  <file:Documentation/networking/sk98lin.txt> for more information about

	  optional driver parameters.

	  Questions concerning this driver may be addressed to:

	      <linux@syskonnect.de>

	  

	  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 <file:Documentation/kbuild/modules.txt>. The module will

	  be called sk98lin. This is recommended.



config VIA_VELOCITY

	tristate "VIA Velocity support"

	depends on PCI

drivers/net/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ obj-$(CONFIG_CHELSIO_T3) += cxgb3/ 
obj-$(CONFIG_EHEA) += ehea/

obj-$(CONFIG_CAN) += can/

obj-$(CONFIG_BONDING) += bonding/

obj-$(CONFIG_ATL1) += atl1/

obj-$(CONFIG_ATL1) += atlx/

obj-$(CONFIG_GIANFAR) += gianfar_driver.o

obj-$(CONFIG_TEHUTI) += tehuti.o
@@ -75,7 +75,6 @@ ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y) 
obj-$(CONFIG_TC35815) += tc35815.o

obj-$(CONFIG_SKGE) += skge.o

obj-$(CONFIG_SKY2) += sky2.o

obj-$(CONFIG_SK98LIN) += sk98lin/

obj-$(CONFIG_SKFP) += skfp/

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

obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o