[Gc-linux-cvs] linux/drivers/net Kconfig, 1.42, 1.43 Makefile, 1.36, 1.37

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

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

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

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Makefile	25 Oct 2009 18:53:45 -0000	1.36
--- Makefile	25 Oct 2009 18:56:56 -0000	1.37
***************
*** 3,6 ****
--- 3,8 ----
  #

+ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
+ 
  obj-$(CONFIG_E1000) += e1000/
  obj-$(CONFIG_E1000E) += e1000e/
***************
*** 74,77 ****
--- 76,80 ----
  obj-$(CONFIG_TIGON3) += tg3.o
  obj-$(CONFIG_BNX2) += bnx2.o
+ obj-$(CONFIG_CNIC) += cnic.o
  obj-$(CONFIG_BNX2X) += bnx2x.o
  bnx2x-objs := bnx2x_main.o bnx2x_link.o
***************
*** 85,88 ****
--- 88,93 ----
  obj-$(CONFIG_SKY2) += sky2.o
  obj-$(CONFIG_SKFP) += skfp/
+ obj-$(CONFIG_KS8842)	+= ks8842.o
+ obj-$(CONFIG_KS8851)	+= ks8851.o
  obj-$(CONFIG_VIA_RHINE) += via-rhine.o
  obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
***************
*** 96,99 ****
--- 101,105 ----

  obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_MDIO) += mdio.o
  obj-$(CONFIG_PHYLIB) += phy/

***************
*** 135,138 ****
--- 141,146 ----
  obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
  obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
+ ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
+ obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
  obj-$(CONFIG_QLA3XXX) += qla3xxx.o
  obj-$(CONFIG_QLGE) += qlge/
***************
*** 239,242 ****
--- 247,251 ----
  obj-$(CONFIG_DNET) += dnet.o
  obj-$(CONFIG_MACB) += macb.o
+ obj-$(CONFIG_S6GMAC) += s6gmac.o

  obj-$(CONFIG_ARM) += arm/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Kconfig	25 Oct 2009 18:53:45 -0000	1.42
--- Kconfig	25 Oct 2009 18:56:56 -0000	1.43
***************
*** 1,3 ****
- 
  #
  # Network device configuration
--- 1,2 ----
***************
*** 27,39 ****
  if NETDEVICES

- config COMPAT_NET_DEV_OPS
-        default y
-        bool "Enable older network device API compatibility"
-        ---help---
-           This option enables kernel compatibility with older network devices
-           that do not use net_device_ops interface.
- 
- 	  If unsure, say Y.
- 
  config IFB
  	tristate "Intermediate Functional Block support"
--- 26,29 ----
***************
*** 527,532 ****
  	tristate "Renesas SuperH Ethernet support"
  	depends on SUPERH && \
! 		(CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7763 || \
! 		 CPU_SUBTYPE_SH7619)
  	select CRC32
  	select MII
--- 517,523 ----
  	tristate "Renesas SuperH Ethernet support"
  	depends on SUPERH && \
! 		(CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
! 		 CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
! 		 CPU_SUBTYPE_SH7724)
  	select CRC32
  	select MII
***************
*** 535,539 ****
  	help
  	  Renesas SuperH Ethernet device driver.
! 	  This driver support SH7710, SH7712, SH7763 and SH7619.

  config SUNLANCE
--- 526,530 ----
  	help
  	  Renesas SuperH Ethernet device driver.
! 	  This driver support SH7710, SH7712, SH7763, SH7619, and SH7724.

  config SUNLANCE
***************
*** 928,931 ****
--- 919,932 ----
  	  will be called netx-eth.

+ config TI_DAVINCI_EMAC
+ 	tristate "TI DaVinci EMAC Support"
+ 	depends on ARM && ARCH_DAVINCI
+ 	select PHYLIB
+ 	help
+ 	  This driver supports TI's DaVinci Ethernet .
+ 
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called davinci_emac_driver.  This is recommended.
+ 
  config DM9000
  	tristate "DM9000 support"
***************
*** 1001,1005 ****
  config SMSC911X
  	tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
! 	depends on ARM || SUPERH
  	select CRC32
  	select MII
--- 1002,1006 ----
  config SMSC911X
  	tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
! 	depends on ARM || SUPERH || BLACKFIN
  	select CRC32
  	select MII
***************
*** 1723,1726 ****
--- 1724,1742 ----
  	  Please email feedback to <tor...@co...>.

+ config KS8842
+ 	tristate "Micrel KSZ8842"
+ 	depends on HAS_IOMEM
+ 	help
+ 	  This platform driver is for Micrel KSZ8842 / KS8842
+ 	  2-port ethernet switch chip (managed, VLAN, QoS).
+ 
+ config KS8851
+        tristate "Micrel KS8851 SPI"
+        depends on SPI
+        select MII
+ 	select CRC32
+        help
+          SPI driver for Micrel KS8851 SPI attached network chip.
+ 
  config VIA_RHINE
  	tristate "VIA Rhine support"
***************
*** 1859,1864 ****

  config FEC
! 	bool "FEC ethernet controller (of ColdFire CPUs)"
! 	depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
--- 1875,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
***************
*** 1881,1885 ****
  	  This option enables support for the MPC5200's on-chip
  	  Fast Ethernet Controller
! 	  If compiled as module, it will be called 'fec_mpc52xx.ko'.

  config FEC_MPC52xx_MDIO
--- 1897,1901 ----
  	  This option enables support for the MPC5200's on-chip
  	  Fast Ethernet Controller
! 	  If compiled as module, it will be called fec_mpc52xx.

  config FEC_MPC52xx_MDIO
***************
*** 1893,1897 ****
  	  If your board uses an external PHY connected to FEC, enable this.
  	  If not sure, enable.
! 	  If compiled as module, it will be called 'fec_mpc52xx_phy.ko'.

  config NE_H8300
--- 1909,1913 ----
  	  If your board uses an external PHY connected to FEC, enable this.
  	  If not sure, enable.
! 	  If compiled as module, it will be called fec_mpc52xx_phy.

  config NE_H8300
***************
*** 2201,2205 ****
         help
  	 This option adds the ability to dump driver state for debugging.
! 	 The file debugfs/skge/ethX displays the state of the internal
  	 transmit and receive rings.

--- 2217,2221 ----
         help
  	 This option adds the ability to dump driver state for debugging.
! 	 The file /sys/kernel/debug/skge/ethX displays the state of the internal
  	 transmit and receive rings.

***************
*** 2227,2231 ****
         help
  	 This option adds the ability to dump driver state for debugging.
! 	 The file debugfs/sky2/ethX displays the state of the internal
  	 transmit and receive rings.

--- 2243,2247 ----
         help
  	 This option adds the ability to dump driver state for debugging.
! 	 The file /sys/kernel/debug/sky2/ethX displays the state of the internal
  	 transmit and receive rings.

***************
*** 2265,2268 ****
--- 2281,2296 ----
  	  will be called bnx2.  This is recommended.

+ config CNIC
+ 	tristate "Broadcom CNIC support"
+ 	depends on PCI
+ 	select BNX2
+ 	select UIO
+ 	help
+ 	  This driver supports offload features of Broadcom NetXtremeII
+ 	  gigabit Ethernet cards.
+ 
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called cnic.  This is recommended.
+ 
  config SPIDER_NET
  	tristate "Spider Gigabit Ethernet driver"
***************
*** 2352,2356 ****
  config MV643XX_ETH
  	tristate "Marvell Discovery (643XX) and Orion ethernet support"
! 	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
  	select INET_LRO
  	select PHYLIB
--- 2380,2384 ----
  config MV643XX_ETH
  	tristate "Marvell Discovery (643XX) and Orion ethernet support"
! 	depends on MV64X60 || PPC32 || PLAT_ORION
  	select INET_LRO
  	select PHYLIB
***************
*** 2363,2366 ****
--- 2391,2402 ----
  	  Ocelot C and Jaguar ATX and Pegasos II.

+ config XILINX_LL_TEMAC
+ 	tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
+ 	select PHYLIB
+ 	depends on PPC_DCR_NATIVE
+ 	help
+ 	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
+ 	  core used in Xilinx Spartan and Virtex FPGAs
+ 
  config QLA3XXX
  	tristate "QLogic QLA3XXX Network Driver Support"
***************
*** 2418,2421 ****
--- 2454,2468 ----
  	  will be called jme.

+ config S6GMAC
+ 	tristate "S6105 GMAC ethernet support"
+ 	depends on XTENSA_VARIANT_S6000
+ 	select PHYLIB
+ 	help
+ 	  This driver supports the on chip ethernet device on the
+ 	  S6105 xtensa processor.
+ 
+ 	  To compile this driver as a module, choose M here. The module
+ 	  will be called s6gmac.
+ 
  endif # NETDEV_1000

***************
*** 2436,2443 ****
--- 2483,2494 ----
  if NETDEV_10000

+ config MDIO
+ 	tristate
+ 
  config CHELSIO_T1
          tristate "Chelsio 10Gb Ethernet support"
          depends on PCI
  	select CRC32
+ 	select MDIO
          help
            This driver supports Chelsio gigabit and 10-gigabit
***************
*** 2472,2475 ****
--- 2523,2527 ----
  	depends on CHELSIO_T3_DEPENDS
  	select FW_LOADER
+ 	select MDIO
  	help
  	  This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
***************
*** 2507,2510 ****
--- 2559,2563 ----
  	tristate "Intel(R) 10GbE PCI Express adapters support"
  	depends on PCI && INET
+ 	select MDIO
  	---help---
  	  This driver supports Intel(R) 10GbE PCI Express family of
***************
*** 2669,2672 ****
--- 2722,2726 ----
  	tristate "Broadcom NetXtremeII 10Gb support"
  	depends on PCI
+ 	select FW_LOADER
  	select ZLIB_INFLATE
  	select LIBCRC32C
***************
*** 2705,2708 ****
--- 2759,2764 ----
  source "drivers/atm/Kconfig"

+ source "drivers/ieee802154/Kconfig"
+ 
  source "drivers/s390/net/Kconfig"