[Gc-linux-cvs] linux/drivers/serial Kconfig, 1.15, 1.16 Makefile, 1.14, 1.15

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

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

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

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	9 Dec 2009 18:40:10 -0000	1.14
--- Makefile	9 Dec 2009 18:44:55 -0000	1.15
***************
*** 82,83 ****
--- 82,84 ----
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
  obj-$(CONFIG_SERIAL_TIMBERDALE)	+= timbuart.o
+ obj-$(CONFIG_SERIAL_USBGECKO) += usbgecko.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Kconfig	9 Dec 2009 18:40:10 -0000	1.15
--- Kconfig	9 Dec 2009 18:44:55 -0000	1.16
***************
*** 1478,1480 ****
--- 1478,1493 ----
  	  you can make it the console by answering Y to this option.
  
+ config SERIAL_USBGECKO
+ 	bool "USBGecko adapter on the Nintendo GameCube/Wii"
+ 	depends on GAMECUBE_EXI
+ 	select SERIAL_CORE
+ 	help
+ 	  This is a driver for the USB Gecko adapter for the Nintendo GameCube
+ 	  and Wii gaming consoles. It provides a console and a tty interface.
+ 
+ 	  If you have an adapter like this, say Y here, otherwise say N.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called usbgecko.
+ 
  endmenu