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

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

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

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


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	25 Oct 2009 18:53:45 -0000	1.10
--- Makefile	25 Oct 2009 18:56:56 -0000	1.11
***************
*** 72,75 ****
--- 72,76 ----
  obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o
  obj-$(CONFIG_SERIAL_UARTLITE) += uartlite.o
+ obj-$(CONFIG_SERIAL_MSM) += msm_serial.o
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
***************
*** 78,79 ****
--- 79,81 ----
  obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
+ obj-$(CONFIG_SERIAL_TIMBERDALE)	+= timbuart.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig	25 Oct 2009 18:53:45 -0000	1.11
--- Kconfig	25 Oct 2009 18:56:56 -0000	1.12
***************
*** 528,532 ****
  config SERIAL_S3C6400
  	tristate "Samsung S3C6400/S3C6410 Serial port support"
! 	depends on SERIAL_SAMSUNG && (CPU_S3C600 || CPU_S3C6410)
  	default y
  	help
--- 528,532 ----
  config SERIAL_S3C6400
  	tristate "Samsung S3C6400/S3C6410 Serial port support"
! 	depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410)
  	default y
  	help
***************
*** 834,837 ****
--- 834,838 ----
  	depends on ARM && (ARCH_IMX || ARCH_MXC)
  	select SERIAL_CORE
+ 	select RATIONAL
  	help
  	  If you have a machine based on a Motorola IMX CPU you
***************
*** 861,865 ****
  
  	  To compile this driver as a module, choose M here: the
! 	  module will be called uartlite.ko.
  
  config SERIAL_UARTLITE_CONSOLE
--- 862,866 ----
  
  	  To compile this driver as a module, choose M here: the
! 	  module will be called uartlite.
  
  config SERIAL_UARTLITE_CONSOLE
***************
*** 1320,1323 ****
--- 1321,1334 ----
  	  say Y or M.  Otherwise, say N.
  
+ config SERIAL_MSM
+ 	bool "MSM on-chip serial port support"
+ 	depends on ARM && ARCH_MSM
+ 	select SERIAL_CORE
+ 
+ config SERIAL_MSM_CONSOLE
+ 	bool "MSM serial console support"
+ 	depends on SERIAL_MSM=y
+ 	select SERIAL_CORE_CONSOLE
+ 
  config SERIAL_NETX
  	tristate "NetX serial port support"
***************
*** 1434,1436 ****
--- 1445,1454 ----
  	default 9600 if (SERIAL_SPORT_BAUD_RATE_9600)
  
+ config SERIAL_TIMBERDALE
+ 	tristate "Support for timberdale UART"
+ 	depends on MFD_TIMBERDALE
+ 	select SERIAL_CORE
+ 	---help---
+ 	Add support for UART controller on timberdale.
+ 
  endmenu