[Gc-linux-cvs] linux/drivers/net Kconfig, 1.35, 1.36 Makefile, 1.29, 1.30

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gc-linux/linux/drivers/net
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/drivers/net

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Makefile	1 Feb 2009 18:29:35 -0000	1.29
--- Makefile	2 Mar 2009 19:26:37 -0000	1.30
***************
*** 54,61 ****
  obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
  obj-$(CONFIG_PCNET32) += pcnet32.o
- obj-$(CONFIG_EEPRO100) += eepro100.o
  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
--- 54,61 ----
  obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
  obj-$(CONFIG_PCNET32) += pcnet32.o
  obj-$(CONFIG_E100) += e100.o
  obj-$(CONFIG_TLAN) += tlan.o
  obj-$(CONFIG_EPIC100) += epic100.o
+ obj-$(CONFIG_SMSC9420) += smsc9420.o
  obj-$(CONFIG_SIS190) += sis190.o
  obj-$(CONFIG_SIS900) += sis900.o
***************
*** 99,103 ****
  obj-$(CONFIG_SEEQ8005) += seeq8005.o
  obj-$(CONFIG_NET_SB1000) += sb1000.o
! obj-$(CONFIG_MAC8390) += mac8390.o
  obj-$(CONFIG_APNE) += apne.o 8390.o
  obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
--- 99,103 ----
  obj-$(CONFIG_SEEQ8005) += seeq8005.o
  obj-$(CONFIG_NET_SB1000) += sb1000.o
! obj-$(CONFIG_MAC8390) += mac8390.o 8390.o
  obj-$(CONFIG_APNE) += apne.o 8390.o
  obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
***************
*** 126,130 ****
  obj-$(CONFIG_B44) += b44.o
  obj-$(CONFIG_FORCEDETH) += forcedeth.o
! obj-$(CONFIG_NE_H8300) += ne-h8300.o
  obj-$(CONFIG_AX88796) += ax88796.o

--- 126,130 ----
  obj-$(CONFIG_B44) += b44.o
  obj-$(CONFIG_FORCEDETH) += forcedeth.o
! obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
  obj-$(CONFIG_AX88796) += ax88796.o

***************
*** 192,196 ****

  obj-$(CONFIG_ETH16I) += eth16i.o
! obj-$(CONFIG_ZORRO8390) += zorro8390.o
  obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
  obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
--- 192,196 ----

  obj-$(CONFIG_ETH16I) += eth16i.o
! obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
  obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
  obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
***************
*** 204,208 ****
  obj-$(CONFIG_ATARILANCE) += atarilance.o
  obj-$(CONFIG_A2065) += a2065.o
! obj-$(CONFIG_HYDRA) += hydra.o
  obj-$(CONFIG_ARIADNE) += ariadne.o
  obj-$(CONFIG_CS89x0) += cs89x0.o
--- 204,208 ----
  obj-$(CONFIG_ATARILANCE) += atarilance.o
  obj-$(CONFIG_A2065) += a2065.o
! obj-$(CONFIG_HYDRA) += hydra.o 8390.o
  obj-$(CONFIG_ARIADNE) += ariadne.o
  obj-$(CONFIG_CS89x0) += cs89x0.o
***************
*** 221,224 ****
--- 221,225 ----
  obj-$(CONFIG_SMC91X) += smc91x.o
  obj-$(CONFIG_SMC911X) += smc911x.o
+ obj-$(CONFIG_SMSC911X) += smsc911x.o
  obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
  obj-$(CONFIG_DM9000) += dm9000.o
***************
*** 264,265 ****
--- 265,267 ----
  obj-$(CONFIG_SFC) += sfc/

+ obj-$(CONFIG_WIMAX) += wimax/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Kconfig	1 Feb 2009 18:29:35 -0000	1.35
--- Kconfig	2 Mar 2009 19:26:37 -0000	1.36
***************
*** 62,65 ****
--- 62,66 ----
  	tristate "Bonding driver support"
  	depends on INET
+ 	depends on IPV6 || IPV6=n
  	---help---
  	  Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
***************
*** 839,843 ****
  config BFIN_MAC
  	tristate "Blackfin on-chip MAC support"
! 	depends on NET_ETHERNET && (BF526 || BF527 || BF536 || BF537)
  	select CRC32
  	select MII
--- 840,844 ----
  config BFIN_MAC
  	tristate "Blackfin on-chip MAC support"
! 	depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
  	select CRC32
  	select MII
***************
*** 988,991 ****
--- 989,1006 ----
  	  here and read <file:Documentation/kbuild/modules.txt>

+ config SMSC911X
+ 	tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
+ 	depends on ARM || SUPERH
+ 	select CRC32
+ 	select MII
+ 	select PHYLIB
+ 	---help---
+ 	  Say Y here if you want support for SMSC LAN911x and LAN921x families
+ 	  of ethernet controllers.
+ 
+ 	  To compile this driver as a module, choose M here and read
+ 	  <file:Documentation/networking/net-modules.txt>. The module
+ 	  will be called smsc911x.
+ 
  config NET_VENDOR_RACAL
  	bool "Racal-Interlan (Micom) NI cards"
***************
*** 1424,1440 ****
  	select PHYLIB

- config EEPRO100
- 	tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
- 	depends on NET_PCI && PCI
- 	select MII
- 	help
- 	  If you have an Intel EtherExpress PRO/100 PCI network (Ethernet)
- 	  card, say Y and read the Ethernet-HOWTO, available from
- 	  <http://www.tldp.org/docs.html#howto>.
- 
- 	  To compile this driver as a module, choose M here. The module
- 	  will be called eepro100.
- 
- 
  config E100
  	tristate "Intel(R) PRO/100+ support"
--- 1439,1442 ----
***************
*** 1608,1612 ****

  config R6040
! 	tristate "RDC R6040 Fast Ethernet Adapter support (EXPERIMENTAL)"
  	depends on NET_PCI && PCI
  	select CRC32
--- 1610,1614 ----

  config R6040
! 	tristate "RDC R6040 Fast Ethernet Adapter support"
  	depends on NET_PCI && PCI
  	select CRC32
***************
*** 1646,1649 ****
--- 1648,1667 ----
  	  <http://www.scyld.com/network/epic100.html>.

+ config SMSC9420
+ 	tristate "SMSC LAN9420 PCI ethernet adapter support"
+ 	depends on NET_PCI && PCI
+ 	select CRC32
+ 	select PHYLIB
+ 	select SMSC_PHY
+ 	help
+ 	  This is a driver for SMSC's LAN9420 PCI ethernet adapter.
+ 	  Say Y if you want it compiled into the kernel,
+ 	  and read the Ethernet-HOWTO, available from
+ 	  <http://www.linuxdoc.org/docs.html#howto>.
+ 
+ 	  This driver is also available as a module. The module will be
+ 	  called smsc9420.  If you want to compile it as a module, say M
+ 	  here and read <file:Documentation/kbuild/modules.txt>
+ 
  config SUNDANCE
  	tristate "Sundance Alta support"
***************
*** 1821,1825 ****
  config FEC
  	bool "FEC ethernet controller (of ColdFire CPUs)"
! 	depends on M523x || M527x || M5272 || M528x || M520x
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
--- 1839,1843 ----
  config FEC
  	bool "FEC ethernet controller (of ColdFire CPUs)"
! 	depends on M523x || M527x || M5272 || M528x || M520x || M532x
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
***************
*** 1991,1998 ****

  config IGB
!        tristate "Intel(R) 82575 PCI-Express Gigabit Ethernet support"
         depends on PCI
         ---help---
!          This driver supports Intel(R) 82575 gigabit ethernet family of
           adapters.  For more information on how to identify your adapter, go
           to the Adapter & Driver ID Guide at:
--- 2009,2016 ----

  config IGB
!        tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
         depends on PCI
         ---help---
!          This driver supports Intel(R) 82575/82576 gigabit ethernet family of
           adapters.  For more information on how to identify your adapter, go
           to the Adapter & Driver ID Guide at:
***************
*** 2286,2293 ****
  	depends on UCC_GETH

- config UGETH_FILTERING
- 	bool "Mac address filtering support"
- 	depends on UCC_GETH
- 
  config UGETH_TX_ON_DEMAND
  	bool "Transmit on Demand support"
--- 2304,2307 ----
***************
*** 2395,2401 ****
            are using only 10G cards say 'N' here.

  config CHELSIO_T3
  	tristate "Chelsio Communications T3 10Gb Ethernet support"
! 	depends on PCI && INET
  	select FW_LOADER
  	select INET_LRO
--- 2409,2420 ----
            are using only 10G cards say 'N' here.

+ config CHELSIO_T3_DEPENDS
+ 	tristate
+ 	depends on PCI && INET
+ 	default y
+ 
  config CHELSIO_T3
  	tristate "Chelsio Communications T3 10Gb Ethernet support"
! 	depends on CHELSIO_T3_DEPENDS
  	select FW_LOADER
  	select INET_LRO
***************
*** 2460,2463 ****
--- 2479,2492 ----
  	  is used, with the intent of lessening the impact of cache misses.

+ config IXGBE_DCB
+ 	bool "Data Center Bridging (DCB) Support"
+ 	default n
+ 	depends on IXGBE && DCB
+ 	---help---
+ 	  Say Y here if you want to use Data Center Bridging (DCB) in the
+ 	  driver.
+ 
+ 	  If unsure, say N.
+ 
  config IXGB
  	tristate "Intel(R) PRO/10GbE support"
***************
*** 2595,2598 ****
--- 2624,2629 ----
  source "drivers/net/wireless/Kconfig"

+ source "drivers/net/wimax/Kconfig"
+ 
  source "drivers/net/usb/Kconfig"

***************
*** 2636,2640 ****

  config FDDI
! 	bool "FDDI driver support"
  	depends on (PCI || EISA || TC)
  	help
--- 2667,2671 ----

  config FDDI
! 	tristate "FDDI driver support"
  	depends on (PCI || EISA || TC)
  	help