[Gc-linux-cvs] linux/drivers/net Kconfig, 1.45, 1.46 Makefile, 1.39, 1.40

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

Update of /cvsroot/gc-linux/linux/drivers/net
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/net

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v2.6.32.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Makefile	9 Dec 2009 18:18:07 -0000	1.39
--- Makefile	9 Dec 2009 18:40:10 -0000	1.40
***************
*** 3,6 ****
--- 3,10 ----
  #
  
+ obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_MDIO) += mdio.o
+ obj-$(CONFIG_PHYLIB) += phy/
+ 
  obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
  
***************
*** 27,30 ****
--- 31,35 ----
  obj-$(CONFIG_JME) += jme.o
  obj-$(CONFIG_BE2NET) += benet/
+ obj-$(CONFIG_VMXNET3) += vmxnet3/
  
  gianfar_driver-objs := gianfar.o \
***************
*** 90,93 ****
--- 95,99 ----
  obj-$(CONFIG_KS8842)	+= ks8842.o
  obj-$(CONFIG_KS8851)	+= ks8851.o
+ obj-$(CONFIG_KS8851_MLL)	+= ks8851_mll.o
  obj-$(CONFIG_VIA_RHINE) += via-rhine.o
  obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
***************
*** 95,98 ****
--- 101,105 ----
  obj-$(CONFIG_RIONET) += rionet.o
  obj-$(CONFIG_SH_ETH) += sh_eth.o
+ obj-$(CONFIG_STMMAC_ETH) += stmmac/
  
  #
***************
*** 100,107 ****
  #
  
- obj-$(CONFIG_MII) += mii.o
- obj-$(CONFIG_MDIO) += mdio.o
- obj-$(CONFIG_PHYLIB) += phy/
- 
  obj-$(CONFIG_SUNDANCE) += sundance.o
  obj-$(CONFIG_HAMACHI) += hamachi.o
--- 107,110 ----
***************
*** 138,141 ****
--- 141,145 ----
  obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
  obj-$(CONFIG_AX88796) += ax88796.o
+ obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
  
  obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
***************
*** 143,146 ****
--- 147,151 ----
  ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
  obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
+ obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
  obj-$(CONFIG_QLA3XXX) += qla3xxx.o
  obj-$(CONFIG_QLGE) += qlge/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** Kconfig	9 Dec 2009 18:18:07 -0000	1.45
--- Kconfig	9 Dec 2009 18:40:10 -0000	1.46
***************
*** 210,214 ****
  config MACB
  	tristate "Atmel MACB support"
! 	depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91CAP9
  	select PHYLIB
  	help
--- 210,214 ----
  config MACB
  	tristate "Atmel MACB support"
! 	depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9
  	select PHYLIB
  	help
***************
*** 976,980 ****
  config ETHOC
  	tristate "OpenCores 10/100 Mbps Ethernet MAC support"
! 	depends on NET_ETHERNET && HAS_IOMEM
  	select MII
  	select PHYLIB
--- 976,980 ----
  config ETHOC
  	tristate "OpenCores 10/100 Mbps Ethernet MAC support"
! 	depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
  	select MII
  	select PHYLIB
***************
*** 1739,1742 ****
--- 1739,1750 ----
           SPI driver for Micrel KS8851 SPI attached network chip.
  
+ config KS8851_MLL
+ 	tristate "Micrel KS8851 MLL"
+ 	depends on HAS_IOMEM
+ 	select MII
+ 	help
+ 	  This platform driver is for Micrel KS8851 Address/data bus
+ 	  multiplexed network chip.
+ 
  config VIA_RHINE
  	tristate "VIA Rhine support"
***************
*** 1777,1781 ****
  config CPMAC
  	tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
! 	depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN
  	select PHYLIB
  	help
--- 1785,1789 ----
  config CPMAC
  	tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
! 	depends on NET_ETHERNET && EXPERIMENTAL && AR7
  	select PHYLIB
  	help
***************
*** 1876,1880 ****
  config FEC
  	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
! 	depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 || ARCH_MX35
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
--- 1884,1888 ----
  config FEC
  	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
! 	depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 || ARCH_MX35 || ARCH_MX25
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
***************
*** 1929,1932 ****
--- 1937,1955 ----
  	  will be called atl2.
  
+ config XILINX_EMACLITE
+ 	tristate "Xilinx 10/100 Ethernet Lite support"
+ 	depends on PPC32 || MICROBLAZE
+ 	help
+ 	  This driver supports the 10/100 Ethernet Lite from Xilinx.
+ 
+ config BCM63XX_ENET
+ 	tristate "Broadcom 63xx internal mac support"
+ 	depends on BCM63XX
+ 	select MII
+ 	select PHYLIB
+ 	help
+ 	  This driver supports the ethernet MACs in the Broadcom 63xx
+ 	  MIPS chipset family (BCM63XX).
+ 
  source "drivers/net/fs_enet/Kconfig"
  
***************
*** 2370,2377 ****
  	  which is available on some Freescale SOCs.
  
- config UGETH_MAGIC_PACKET
- 	bool "Magic Packet detection support"
- 	depends on UCC_GETH
- 
  config UGETH_TX_ON_DEMAND
  	bool "Transmit on Demand support"
--- 2393,2396 ----
***************
*** 2465,2468 ****
--- 2484,2489 ----
  	  will be called s6gmac.
  
+ source "drivers/net/stmmac/Kconfig"
+ 
  endif # NETDEV_1000
  
***************
*** 2725,2728 ****
--- 2746,2750 ----
  	select ZLIB_INFLATE
  	select LIBCRC32C
+ 	select MDIO
  	help
  	  This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
***************
*** 3212,3214 ****
--- 3234,3244 ----
            lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
  
+ config VMXNET3
+        tristate "VMware VMXNET3 ethernet driver"
+        depends on PCI && X86 && INET
+        help
+          This driver supports VMware's vmxnet3 virtual ethernet NIC.
+          To compile this driver as a module, choose M here: the
+          module will be called vmxnet3.
+ 
  endif # NETDEVICES