/spare/repo/netdev-2.6 branch 'sis190'

diff --combined MAINTAINERS
index 564a03e61a0c4b2322136ab9d96b3f121391ee83,b39faa31d76e95580bcf797e4c1914b4d7b46b54..e8214fe53a5e919feb0e640b189d3b6126a991e3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -784,7 -784,7 +784,7 @@@ DVB SUBSYSTEM AND DRIVER
  P:    LinuxTV.org Project
  M:    linux-dvb-maintainer@linuxtv.org
  L:    linux-dvb@linuxtv.org (subscription required)
 -W:    http://linuxtv.org/developer/dvb.xml
 +W:    http://linuxtv.org/
  S:    Supported
  
  EATA-DMA SCSI DRIVER
@@@ -1521,12 -1521,6 +1521,12 @@@ P:    Zach Brow
  M:    zab@zabbo.net
  S:    Odd Fixes
  
 +MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 +P: Michael Kerrisk
 +M: mtk-manpages@gmx.net
 +W: ftp://ftp.kernel.org/pub/linux/docs/manpages
 +S: Maintained
 +
  MARVELL MV64340 ETHERNET DRIVER
  P:    Manish Lachwani
  M:    Manish_Lachwani@pmc-sierra.com
@@@ -1658,7 -1652,7 +1658,7 @@@ M:      kuznet@ms2.inr.ac.r
  P:    Pekka Savola (ipv6)
  M:    pekkas@netcore.fi
  P:    James Morris
 -M:    jmorris@redhat.com
 +M:    jmorris@namei.org
  P:    Hideaki YOSHIFUJI
  M:    yoshfuji@linux-ipv6.org
  P:    Patrick McHardy
@@@ -1739,7 -1733,7 +1739,7 @@@ S:      Maintaine
  
  OPL3-SA2, SA3, and SAx DRIVER
  P:    Zwane Mwaikambo
 -M:    zwane@commfireservices.com
 +M:    zwane@arm.linux.org.uk
  L:    linux-sound@vger.kernel.org
  S:    Maintained
  
@@@ -1825,12 -1819,6 +1825,12 @@@ P:    Greg Kroah-Hartma
  M:    greg@kroah.com
  S:    Maintained
  
 +PCIE HOTPLUG DRIVER
 +P:    Kristen Carlson Accardi
 +M:    kristen.c.accardi@intel.com
 +L:    pcihpd-discuss@lists.sourceforge.net
 +S:    Maintained
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    http://lists.infradead.org/mailman/listinfo/linux-pcmcia
@@@ -1995,7 -1983,7 +1995,7 @@@ S:      Maintaine
  
  SC1200 WDT DRIVER
  P:    Zwane Mwaikambo
 -M:    zwane@commfireservices.com
 +M:    zwane@arm.linux.org.uk
  S:    Maintained
  
  SCHEDULER
@@@ -2053,7 -2041,7 +2053,7 @@@ SELINUX SECURITY MODUL
  P:    Stephen Smalley
  M:    sds@epoch.ncsc.mil
  P:    James Morris
 -M:    jmorris@redhat.com
 +M:    jmorris@namei.org
  L:    linux-kernel@vger.kernel.org (kernel issues)
  L:    selinux@tycho.nsa.gov (general discussion)
  W:    http://www.nsa.gov/selinux
@@@ -2092,6 -2080,12 +2092,12 @@@ M:    support@simtec.co.u
  W:    http://www.simtec.co.uk/products/EB2410ITX/
  S:    Supported
  
+ SIS 190 ETHERNET DRIVER
+ P:    Francois Romieu
+ M:    romieu@fr.zoreil.com
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ 
  SIS 5513 IDE CONTROLLER DRIVER
  P:    Lionel Bouton
  M:    Lionel.Bouton@inet6.fr
@@@ -2207,12 -2201,6 +2213,12 @@@ W:    http://projects.buici.com/ar
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
 +SHPC HOTPLUG DRIVER
 +P:    Kristen Carlson Accardi
 +M:    kristen.c.accardi@intel.com
 +L:    pcihpd-discuss@lists.sourceforge.net
 +S:    Maintained
 +
  SPARC (sparc32):
  P:    William L. Irwin
  M:    wli@holomorphy.com

diff --combined drivers/net/Kconfig
index 79e8aa6f2b9edfc215e43b1a1b0a934274a680f4,26e4aa93afd621a93ae36ddea2afff260e36d08a..43d14bfb1016159aee70490fad62aa18581c4361
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -131,8 -131,6 +131,8 @@@ config NET_SB100
  
        source "drivers/net/arcnet/Kconfig"
  
 +source "drivers/net/phy/Kconfig"
 +
  #
  #     Ethernet
  #
@@@ -1147,7 -1145,7 +1147,7 @@@ config IBMVET
          be called ibmveth.
  
  config IBM_EMAC
 -      tristate "IBM PPC4xx EMAC driver support"
 +      bool "IBM PPC4xx EMAC driver support"
        depends on 4xx
        select CRC32
        ---help---
@@@ -1156,7 -1154,7 +1156,7 @@@
  
  config IBM_EMAC_ERRMSG
        bool "Verbose error messages"
 -      depends on IBM_EMAC
 +      depends on IBM_EMAC && BROKEN
  
  config IBM_EMAC_RXB
        int "Number of receive buffers"
@@@ -1923,6 -1921,17 +1923,17 @@@ config R8169_VLA
          
          If in doubt, say Y.
  
+ config SIS190
+       tristate "SiS190 gigabit ethernet support"
+       depends on PCI
+       select CRC32
+       select MII
+       ---help---
+         Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter.
+ 
+         To compile this driver as a module, choose M here: the module
+         will be called sis190.  This is recommended.
+ 
  config SKGE
        tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"
        depends on PCI && EXPERIMENTAL

diff --combined drivers/net/Makefile
index a369ae284a9a23cd5aaa7590ea584573df6dbe78,67b280af425e4f60f877498b00b24a7356fee011..c5c71d7075878ae029f708acd201e3739df7be16
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -42,6 -42,7 +42,7 @@@ obj-$(CONFIG_EEPRO100) += eepro100.
  obj-$(CONFIG_E100) += e100.o
  obj-$(CONFIG_TLAN) += tlan.o
  obj-$(CONFIG_EPIC100) += epic100.o
+ obj-$(CONFIG_SIS190) += sis190.o
  obj-$(CONFIG_SIS900) += sis900.o
  obj-$(CONFIG_YELLOWFIN) += yellowfin.o
  obj-$(CONFIG_ACENIC) += acenic.o
@@@ -65,7 -66,6 +66,7 @@@ obj-$(CONFIG_ADAPTEC_STARFIRE) += starf
  #
  
  obj-$(CONFIG_MII) += mii.o
 +obj-$(CONFIG_PHYLIB) += phy/
  
  obj-$(CONFIG_SUNDANCE) += sundance.o
  obj-$(CONFIG_HAMACHI) += hamachi.o