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

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

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

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


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	9 Dec 2009 18:18:07 -0000	1.13
--- Makefile	9 Dec 2009 18:40:10 -0000	1.14
***************
*** 35,38 ****
--- 35,39 ----
  obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o
  obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
+ obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o
  obj-$(CONFIG_SERIAL_BFIN) += bfin_5xx.o
  obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
***************
*** 44,47 ****
--- 45,49 ----
  obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o
  obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o
+ obj-$(CONFIG_SERIAL_S5PC100) += s3c6400.o
  obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
  obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Kconfig	9 Dec 2009 18:18:07 -0000	1.14
--- Kconfig	9 Dec 2009 18:40:10 -0000	1.15
***************
*** 460,464 ****
  	depends on ARM && PLAT_S3C
  	default 2 if ARCH_S3C2400
! 	default 4 if ARCH_S3C64XX || CPU_S3C2443
  	default 3
  	help
--- 460,464 ----
  	depends on ARM && PLAT_S3C
  	default 2 if ARCH_S3C2400
! 	default 4 if ARCH_S5PC1XX || ARCH_S3C64XX || CPU_S3C2443
  	default 3
  	help
***************
*** 534,537 ****
--- 534,544 ----
  	  SoCs
  
+ config SERIAL_S5PC100
+ 	tristate "Samsung S5PC100 Serial port support"
+ 	depends on SERIAL_SAMSUNG && CPU_S5PC100
+ 	default y
+ 	help
+ 	  Serial port support for the Samsung S5PC100 SoCs
+ 
  config SERIAL_MAX3100
  	tristate "MAX3100 support"
***************
*** 856,860 ****
  config SERIAL_UARTLITE
  	tristate "Xilinx uartlite serial port support"
! 	depends on PPC32 || MICROBLAZE
  	select SERIAL_CORE
  	help
--- 863,867 ----
  config SERIAL_UARTLITE
  	tristate "Xilinx uartlite serial port support"
! 	depends on PPC32 || MICROBLAZE || MFD_TIMBERDALE
  	select SERIAL_CORE
  	help
***************
*** 1452,1454 ****
--- 1459,1480 ----
  	Add support for UART controller on timberdale.
  
+ config SERIAL_BCM63XX
+ 	tristate "bcm63xx serial port support"
+ 	select SERIAL_CORE
+ 	depends on BCM63XX
+ 	help
+ 	  If you have a bcm63xx CPU, you can enable its onboard
+ 	  serial port by enabling this options.
+ 
+           To compile this driver as a module, choose M here: the
+           module will be called bcm963xx_uart.
+ 
+ config SERIAL_BCM63XX_CONSOLE
+ 	bool "Console on bcm63xx serial port"
+ 	depends on SERIAL_BCM63XX=y
+ 	select SERIAL_CORE_CONSOLE
+ 	help
+ 	  If you have enabled the serial port on the bcm63xx CPU
+ 	  you can make it the console by answering Y to this option.
+ 
  endmenu