[Gc-linux-cvs] linux/drivers/net Kconfig, 1.46, 1.47 Makefile, 1.40, 1.41

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

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

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.32.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Makefile	9 Dec 2009 18:40:10 -0000	1.40
--- Makefile	9 Dec 2009 18:44:55 -0000	1.41
***************
*** 247,250 ****
--- 247,251 ----
  obj-$(CONFIG_ENC28J60) += enc28j60.o
  obj-$(CONFIG_ETHOC) += ethoc.o
+ obj-$(CONFIG_GAMECUBE_BBA) += gcn-bba.o
  
  obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** Kconfig	9 Dec 2009 18:40:10 -0000	1.46
--- Kconfig	9 Dec 2009 18:44:55 -0000	1.47
***************
*** 271,274 ****
--- 271,283 ----
  	  will be called bmac.
  
+ config GAMECUBE_BBA
+ 	tristate "Nintendo GameCube ethernet BroadBand Adapter (BBA)"
+ 	depends on GAMECUBE_EXI && GAMECUBE
+ 	help
+ 	  Say Y here to add ethernet support for the Broadband Adapter (BBA).
+ 
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called gcn-bba.
+ 
  config ARIADNE
  	tristate "Ariadne support"