Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (7677ced4) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/feature-removal-schedule.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -333,3 +333,10 @@ Why: Unmaintained for years, superceded by JFFS2 for years.
		Who: Jeff Garzik <jeff@garzik.org>

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

		What: sk98lin network driver
		When: July 2007
		Why: In kernel tree version of driver is unmaintained. Sk98lin driver
		replaced by the skge driver.
		Who: Stephen Hemminger <shemminger@osdl.org>

MAINTAINERS

+17 −1

Original line number	Diff line number	Diff line
		@@ -598,6 +598,16 @@ M: ecashin@coraid.com
		W: http://www.coraid.com/support/linux
		S: Supported

		ATL1 ETHERNET DRIVER
		P: Jay Cliburn
		M: jcliburn@gmail.com
		P: Chris Snook
		M: csnook@redhat.com
		L: atl1-devel@lists.sourceforge.net
		W: http://sourceforge.net/projects/atl1
		W: http://atl1.sourceforge.net
		S: Maintained

		ATM
		P: Chas Williams
		M: chas@cmf.nrl.navy.mil
		@@ -2485,6 +2495,12 @@ L: orinoco-devel@lists.sourceforge.net
		W: http://www.nongnu.org/orinoco/
		S: Maintained

		PA SEMI ETHERNET DRIVER
		P: Olof Johansson
		M: olof@lixom.net
		L: netdev@vger.kernel.org
		S: Maintained

		PARALLEL PORT SUPPORT
		P: Phil Blundell
		M: philb@gnu.org
		@@ -2654,7 +2670,7 @@ S: Supported

		PRISM54 WIRELESS DRIVER
		P: Prism54 Development Team
		M: prism54-private@prism54.org
		M: developers@islsm.org
		L: netdev@vger.kernel.org
		W: http://prism54.org
		S: Maintained

drivers/net/3c59x.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -792,8 +792,7 @@ static void poll_vortex(struct net_device *dev)
		{
		struct vortex_private *vp = netdev_priv(dev);
		unsigned long flags;
		local_save_flags(flags);
		local_irq_disable();
		local_irq_save(flags);
		(vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev);
		local_irq_restore(flags);
		}

drivers/net/Kconfig

+39 −26

Original line number	Diff line number	Diff line
		@@ -190,7 +190,7 @@ config MII

		config MACB
		tristate "Atmel MACB support"
		depends on NET_ETHERNET && AVR32
		depends on NET_ETHERNET && (AVR32 \|\| ARCH_AT91SAM9260 \|\| ARCH_AT91SAM9263)
		select MII
		help
		The Atmel MACB ethernet interface is found on many AT32 and AT91
		@@ -235,16 +235,6 @@ config BMAC
		To compile this driver as a module, choose M here: the module
		will be called bmac.

		config OAKNET
		tristate "National DP83902AV (Oak ethernet) support"
		depends on NET_ETHERNET && PPC && BROKEN
		select CRC32
		help
		Say Y if your machine has this type of Ethernet network card.

		To compile this driver as a module, choose M here: the module
		will be called oaknet.

		config ARIADNE
		tristate "Ariadne support"
		depends on NET_ETHERNET && ZORRO
		@@ -1155,21 +1145,6 @@ config SEEQ8005
		<file:Documentation/networking/net-modules.txt>. The module
		will be called seeq8005.

		config SKMC
		tristate "SKnet MCA support"
		depends on NET_ETHERNET && MCA && BROKEN
		---help---
		These are Micro Channel Ethernet adapters. You need to say Y to "MCA
		support" in order to use this driver. Supported cards are the SKnet
		Junior MC2 and the SKnet MC2(+). The driver automatically
		distinguishes between the two cards. Note that using multiple boards
		of different type hasn't been tested with this driver. Say Y if you
		have one of these Ethernet adapters.

		To compile this driver as a module, choose M here and read
		<file:Documentation/networking/net-modules.txt>. The module
		will be called sk_mca.

		config NE2_MCA
		tristate "NE/2 (ne2000 MCA version) support"
		depends on NET_ETHERNET && MCA_LEGACY
		@@ -1788,6 +1763,18 @@ config LAN_SAA9730
		workstations.
		See <http://www.semiconductors.philips.com/pip/SAA9730_flyer_1>.

		config SC92031
		tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
		depends on NET_PCI && PCI && EXPERIMENTAL
		select CRC32
		---help---
		This is a driver for the Fast Ethernet PCI network cards based on
		the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
		have one of these, say Y here.

		To compile this driver as a module, choose M here: the module
		will be called sc92031. This is recommended.

		config NET_POCKET
		bool "Pocket and portable adapters"
		depends on NET_ETHERNET && PARPORT
		@@ -2392,6 +2379,24 @@ config CHELSIO_T1_NAPI
		NAPI is a driver API designed to reduce CPU and interrupt load
		when the driver is receiving lots of packets from the card.

		config CHELSIO_T3
		tristate "Chelsio Communications T3 10Gb Ethernet support"
		depends on PCI
		help
		This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
		adapters.

		For general information about Chelsio and our products, visit
		our website at <http://www.chelsio.com>.

		For customer support, please visit our customer support page at
		<http://www.chelsio.com/support.htm>.

		Please send feedback to <linux-bugs@chelsio.com>.

		To compile this driver as a module, choose M here: the module
		will be called cxgb3.

		config EHEA
		tristate "eHEA Ethernet support"
		depends on IBMEBUS
		@@ -2488,6 +2493,13 @@ config NETXEN_NIC
		help
		This enables the support for NetXen's Gigabit Ethernet card.

		config PASEMI_MAC
		tristate "PA Semi 1/10Gbit MAC"
		depends on PPC64 && PCI
		help
		This driver supports the on-chip 1/10Gbit Ethernet controller on
		PA Semi's PWRficient line of chips.

		endmenu

		source "drivers/net/tokenring/Kconfig"
		@@ -2541,6 +2553,7 @@ config DEFXX
		config SKFP
		tristate "SysKonnect FDDI PCI support"
		depends on FDDI && PCI
		select BITREVERSE
		---help---
		Say Y here if you have a SysKonnect FDDI PCI adapter.
		The following adapters are supported by this driver:

drivers/net/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ obj-$(CONFIG_E1000) += e1000/
		obj-$(CONFIG_IBM_EMAC) += ibm_emac/
		obj-$(CONFIG_IXGB) += ixgb/
		obj-$(CONFIG_CHELSIO_T1) += chelsio/
		obj-$(CONFIG_CHELSIO_T3) += cxgb3/
		obj-$(CONFIG_EHEA) += ehea/
		obj-$(CONFIG_BONDING) += bonding/
		obj-$(CONFIG_GIANFAR) += gianfar_driver.o
		@@ -36,8 +37,6 @@ obj-$(CONFIG_CASSINI) += cassini.o
		obj-$(CONFIG_MACE) += mace.o
		obj-$(CONFIG_BMAC) += bmac.o

		obj-$(CONFIG_OAKNET) += oaknet.o 8390.o

		obj-$(CONFIG_DGRS) += dgrs.o
		obj-$(CONFIG_VORTEX) += 3c59x.o
		obj-$(CONFIG_TYPHOON) += typhoon.o
		@@ -137,7 +136,6 @@ obj-$(CONFIG_AT1700) += at1700.o
		obj-$(CONFIG_EL1) += 3c501.o
		obj-$(CONFIG_EL16) += 3c507.o
		obj-$(CONFIG_ELMC) += 3c523.o
		obj-$(CONFIG_SKMC) += sk_mca.o
		obj-$(CONFIG_IBMLANA) += ibmlana.o
		obj-$(CONFIG_ELMC_II) += 3c527.o
		obj-$(CONFIG_EL3) += 3c509.o
		@@ -160,6 +158,7 @@ obj-$(CONFIG_APRICOT) += 82596.o
		obj-$(CONFIG_LASI_82596) += lasi_82596.o
		obj-$(CONFIG_MVME16x_NET) += 82596.o
		obj-$(CONFIG_BVME6000_NET) += 82596.o
		obj-$(CONFIG_SC92031) += sc92031.o

		# This is also a 82596 and should probably be merged
		obj-$(CONFIG_LP486E) += lp486e.o
		@@ -196,6 +195,7 @@ obj-$(CONFIG_SMC91X) += smc91x.o
		obj-$(CONFIG_SMC911X) += smc911x.o
		obj-$(CONFIG_DM9000) += dm9000.o
		obj-$(CONFIG_FEC_8XX) += fec_8xx/
		obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o

		obj-$(CONFIG_MACB) += macb.o