Commit d0174640 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  drivers/net/pcmcia/3c589_cs: fix port configuration switcheroo
  sk98lin: resurrect driver
  ucc_geth: fix compilation
  mv643xx_eth: Fix tx_bytes stats calculation
  As struct iw_point is bi-directional payload, we should copy back the content
  [PATCH] bcm43xx: Fix cancellation of work queue crashes
  spidernet: fix interrupt reason recognition
  ehea: fix last_rx update
  ehea: propagate physical port state
  Fix a lock problem in generic phy code
  sky2: restore multicast list on resume and other ops
  atl1: disable broken 64-bit DMA
parents bb8bd3a5 fadacb1b

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -298,3 +298,11 @@ Why: All mthca hardware also supports MSI-X, which provides 
Who:	Roland Dreier <rolandd@cisco.com>



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



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>



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

Documentation/networking/00-INDEX

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ routing.txt 
	- the new routing mechanism

shaper.txt

	- info on the module that can shape/limit transmitted traffic.

sk98lin.txt

	- Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit

	  Ethernet Adapter family driver info

skfp.txt

	- SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.

smc9.txt

Documentation/networking/sk98lin.txt

0 → 100644
+568 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/Kconfig

+88 −1

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ ps3_gelic-objs += ps3_gelic_net.o 
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

CRA Git | Maintained and supported by SUSTech CRA and CCSE