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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

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


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/rtc/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
***************
*** 18,21 ****
--- 18,22 ----
  # Keep the list ordered.
  
+ obj-$(CONFIG_RTC_DRV_AB3100)	+= rtc-ab3100.o
  obj-$(CONFIG_RTC_DRV_AT32AP700X)+= rtc-at32ap700x.o
  obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
***************
*** 23,27 ****
--- 24,30 ----
  obj-$(CONFIG_RTC_DRV_AU1XXX)	+= rtc-au1xxx.o
  obj-$(CONFIG_RTC_DRV_BFIN)	+= rtc-bfin.o
+ obj-$(CONFIG_RTC_DRV_BQ4802)	+= rtc-bq4802.o
  obj-$(CONFIG_RTC_DRV_CMOS)	+= rtc-cmos.o
+ obj-$(CONFIG_RTC_DRV_COH901331)	+= rtc-coh901331.o
  obj-$(CONFIG_RTC_DRV_DM355EVM)	+= rtc-dm355evm.o
  obj-$(CONFIG_RTC_DRV_DS1216)	+= rtc-ds1216.o
***************
*** 40,43 ****
--- 43,47 ----
  obj-$(CONFIG_RTC_DRV_EP93XX)	+= rtc-ep93xx.o
  obj-$(CONFIG_RTC_DRV_FM3130)	+= rtc-fm3130.o
+ obj-$(CONFIG_RTC_DRV_GENERIC)	+= rtc-generic.o
  obj-$(CONFIG_RTC_DRV_ISL1208)	+= rtc-isl1208.o
  obj-$(CONFIG_RTC_DRV_M41T80)	+= rtc-m41t80.o
***************
*** 46,61 ****
  obj-$(CONFIG_RTC_DRV_M48T59)	+= rtc-m48t59.o
  obj-$(CONFIG_RTC_DRV_M48T86)	+= rtc-m48t86.o
! obj-$(CONFIG_RTC_DRV_BQ4802)	+= rtc-bq4802.o
! obj-$(CONFIG_RTC_DRV_SUN4V)	+= rtc-sun4v.o
! obj-$(CONFIG_RTC_DRV_STARFIRE)	+= rtc-starfire.o
  obj-$(CONFIG_RTC_DRV_MAX6900)	+= rtc-max6900.o
  obj-$(CONFIG_RTC_DRV_MAX6902)	+= rtc-max6902.o
  obj-$(CONFIG_RTC_DRV_MV)	+= rtc-mv.o
  obj-$(CONFIG_RTC_DRV_OMAP)	+= rtc-omap.o
  obj-$(CONFIG_RTC_DRV_PCF8563)	+= rtc-pcf8563.o
  obj-$(CONFIG_RTC_DRV_PCF8583)	+= rtc-pcf8583.o
  obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030.o
  obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o
! obj-$(CONFIG_RTC_DRV_GENERIC)	+= rtc-generic.o
  obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
  obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
--- 50,66 ----
  obj-$(CONFIG_RTC_DRV_M48T59)	+= rtc-m48t59.o
  obj-$(CONFIG_RTC_DRV_M48T86)	+= rtc-m48t86.o
! obj-$(CONFIG_RTC_MXC)		+= rtc-mxc.o
  obj-$(CONFIG_RTC_DRV_MAX6900)	+= rtc-max6900.o
  obj-$(CONFIG_RTC_DRV_MAX6902)	+= rtc-max6902.o
  obj-$(CONFIG_RTC_DRV_MV)	+= rtc-mv.o
  obj-$(CONFIG_RTC_DRV_OMAP)	+= rtc-omap.o
+ obj-$(CONFIG_RTC_DRV_PCAP)	+= rtc-pcap.o
  obj-$(CONFIG_RTC_DRV_PCF8563)	+= rtc-pcf8563.o
  obj-$(CONFIG_RTC_DRV_PCF8583)	+= rtc-pcf8583.o
+ obj-$(CONFIG_RTC_DRV_PCF2123)	+= rtc-pcf2123.o
+ obj-$(CONFIG_RTC_DRV_PCF50633)	+= rtc-pcf50633.o
  obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030.o
  obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o
! obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
  obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
  obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
***************
*** 69,73 ****
--- 74,81 ----
  obj-$(CONFIG_RTC_DRV_SA1100)	+= rtc-sa1100.o
  obj-$(CONFIG_RTC_DRV_SH)	+= rtc-sh.o
+ obj-$(CONFIG_RTC_DRV_STARFIRE)	+= rtc-starfire.o
  obj-$(CONFIG_RTC_DRV_STK17TA8)	+= rtc-stk17ta8.o
+ obj-$(CONFIG_RTC_DRV_STMP)	+= rtc-stmp3xxx.o
+ obj-$(CONFIG_RTC_DRV_SUN4V)	+= rtc-sun4v.o
  obj-$(CONFIG_RTC_DRV_TEST)	+= rtc-test.o
  obj-$(CONFIG_RTC_DRV_TWL4030)	+= rtc-twl4030.o
***************
*** 75,80 ****
  obj-$(CONFIG_RTC_DRV_V3020)	+= rtc-v3020.o
  obj-$(CONFIG_RTC_DRV_VR41XX)	+= rtc-vr41xx.o
  obj-$(CONFIG_RTC_DRV_WM8350)	+= rtc-wm8350.o
  obj-$(CONFIG_RTC_DRV_X1205)	+= rtc-x1205.o
- obj-$(CONFIG_RTC_DRV_PCF50633)	+= rtc-pcf50633.o
- obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
--- 83,87 ----
  obj-$(CONFIG_RTC_DRV_V3020)	+= rtc-v3020.o
  obj-$(CONFIG_RTC_DRV_VR41XX)	+= rtc-vr41xx.o
+ obj-$(CONFIG_RTC_DRV_WM831X)	+= rtc-wm831x.o
  obj-$(CONFIG_RTC_DRV_WM8350)	+= rtc-wm8350.o
  obj-$(CONFIG_RTC_DRV_X1205)	+= rtc-x1205.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Kconfig	9 Dec 2009 18:18:07 -0000	1.13
--- Kconfig	9 Dec 2009 18:40:10 -0000	1.14
***************
*** 379,382 ****
--- 379,391 ----
  	  will be called rtc-ds3234.
  
+ config RTC_DRV_PCF2123
+ 	tristate "NXP PCF2123"
+ 	help
+ 	  If you say yes here you get support for the NXP PCF2123
+ 	  RTC chip.
+ 
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-pcf2123.
+ 
  endif # SPI_MASTER
  
***************
*** 501,504 ****
--- 510,524 ----
  	  will be called "rtc-m48t59".
  
+ config RTC_MXC
+ 	tristate "Freescale MXC Real Time Clock"
+ 	depends on ARCH_MXC
+ 	depends on RTC_CLASS
+ 	help
+ 	   If you say yes here you get support for the Freescale MXC
+ 	   RTC module.
+ 
+ 	   This driver can also be built as a module, if so, the module
+ 	   will be called "rtc-mxc".
+ 
  config RTC_DRV_BQ4802
  	tristate "TI BQ4802"
***************
*** 519,522 ****
--- 539,552 ----
  	  will be called rtc-v3020.
  
+ config RTC_DRV_WM831X
+ 	tristate "Wolfson Microelectronics WM831x RTC"
+ 	depends on MFD_WM831X
+ 	help
+ 	  If you say yes here you will get support for the RTC subsystem
+ 	  of the Wolfson Microelectronics WM831X series PMICs.
+ 
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called "rtc-wm831x".
+ 
  config RTC_DRV_WM8350
  	tristate "Wolfson Microelectronics WM8350 RTC"
***************
*** 536,539 ****
--- 566,578 ----
  	  NXP PCF50633 used in embedded systems.
  
+ config RTC_DRV_AB3100
+ 	tristate "ST-Ericsson AB3100 RTC"
+ 	depends on AB3100_CORE
+ 	default y if AB3100_CORE
+ 	help
+ 	  Select this to enable the ST-Ericsson AB3100 Mixed Signal IC RTC
+ 	  support. This chip contains a battery- and capacitor-backed RTC.
+ 
+ 
  comment "on-CPU RTC drivers"
  
***************
*** 760,762 ****
--- 799,830 ----
  	  will be called rtc-ps3.
  
+ config RTC_DRV_COH901331
+ 	tristate "ST-Ericsson COH 901 331 RTC"
+ 	depends on ARCH_U300
+ 	help
+ 	  If you say Y here you will get access to ST-Ericsson
+ 	  COH 901 331 RTC clock found in some ST-Ericsson Mobile
+ 	  Platforms.
+ 
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called "rtc-coh901331".
+ 
+ 
+ config RTC_DRV_STMP
+ 	tristate "Freescale STMP3xxx RTC"
+ 	depends on ARCH_STMP3XXX
+ 	help
+ 	  If you say yes here you will get support for the onboard
+ 	  STMP3xxx RTC.
+ 
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-stmp3xxx.
+ 
+ config RTC_DRV_PCAP
+ 	tristate "PCAP RTC"
+ 	depends on EZX_PCAP
+ 	help
+ 	  If you say Y here you will get support for the RTC found on
+ 	  the PCAP2 ASIC used on some Motorola phones.
+ 
  endif # RTC_CLASS