[Gc-linux-cvs] linux/drivers/net Kconfig, 1.36, 1.37 Makefile, 1.30, 1.31

[Albert H. <he...@us...>]

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

Modified Files:
	Kconfig Makefile 
Log Message:
Merge 2.6.29-rc7.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Makefile	2 Mar 2009 19:26:37 -0000	1.30
--- Makefile	5 Mar 2009 19:58:46 -0000	1.31
***************
*** 18,21 ****
--- 18,22 ----
  obj-$(CONFIG_ATL2) += atlx/
  obj-$(CONFIG_ATL1E) += atl1e/
+ obj-$(CONFIG_ATL1C) += atl1c/
  obj-$(CONFIG_GIANFAR) += gianfar_driver.o
  obj-$(CONFIG_TEHUTI) += tehuti.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Kconfig	2 Mar 2009 19:26:37 -0000	1.36
--- Kconfig	5 Mar 2009 19:58:46 -0000	1.37
***************
*** 2352,2355 ****
--- 2352,2366 ----
  	  will be called atl1e.
  
+ config ATL1C
+ 	tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
+ 	depends on PCI && EXPERIMENTAL
+ 	select CRC32
+ 	select MII
+ 	help
+ 	  This driver supports the Atheros L1C gigabit ethernet adapter.
+ 
+ 	  To compile this driver as a module, choose M here.  The module
+ 	  will be called atl1c.
+ 
  config JME
  	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"