[Gc-linux-cvs] linux/drivers/serial Kconfig, 1.12, 1.13 Makefile, 1.11, 1.12

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

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

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	25 Oct 2009 18:56:56 -0000	1.11
--- Makefile	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 80,81 ****
--- 80,82 ----
  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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.12
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.13
***************
*** 1452,1454 ****
--- 1452,1467 ----
  	Add support for UART controller on timberdale.
  
+ 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