[Gc-linux-cvs] linux/drivers/rtc Kconfig,1.7,1.8 Makefile,1.7,1.8

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

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

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v.2.6.30.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	25 Oct 2009 18:33:47 -0000	1.7
--- Makefile	25 Oct 2009 18:45:36 -0000	1.8
***************
*** 37,40 ****
--- 37,41 ----
  obj-$(CONFIG_RTC_DRV_DS1742)	+= rtc-ds1742.o
  obj-$(CONFIG_RTC_DRV_DS3234)	+= rtc-ds3234.o
+ obj-$(CONFIG_RTC_DRV_EFI)	+= rtc-efi.o
  obj-$(CONFIG_RTC_DRV_EP93XX)	+= rtc-ep93xx.o
  obj-$(CONFIG_RTC_DRV_FM3130)	+= rtc-fm3130.o
***************
*** 56,61 ****
  obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030.o
  obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o
! obj-$(CONFIG_RTC_DRV_PARISC)	+= rtc-parisc.o
! obj-$(CONFIG_RTC_DRV_PPC)	+= rtc-ppc.o
  obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
  obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
--- 57,61 ----
  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
***************
*** 77,78 ****
--- 77,79 ----
  obj-$(CONFIG_RTC_DRV_X1205)	+= rtc-x1205.o
  obj-$(CONFIG_RTC_DRV_PCF50633)	+= rtc-pcf50633.o
+ obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Kconfig	25 Oct 2009 18:33:47 -0000	1.7
--- Kconfig	25 Oct 2009 18:45:36 -0000	1.8
***************
*** 130,140 ****

  config RTC_DRV_DS1307
! 	tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00"
  	help
  	  If you say yes here you get support for various compatible RTC
  	  chips (often with battery backup) connected with I2C. This driver
  	  should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00,
! 	  and probably other chips. In some cases the RTC must already
! 	  have been initialized (by manufacturing or a bootloader).

  	  The first seven registers on these chips hold an RTC, and other
--- 130,141 ----

  config RTC_DRV_DS1307
! 	tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025"
  	help
  	  If you say yes here you get support for various compatible RTC
  	  chips (often with battery backup) connected with I2C. This driver
  	  should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00,
! 	  EPSON RX-8025 and probably other chips. In some cases the RTC
! 	  must already have been initialized (by manufacturing or a
! 	  bootloader).

  	  The first seven registers on these chips hold an RTC, and other
***************
*** 225,233 ****

  config RTC_DRV_M41T80
! 	tristate "ST M41T65/M41T80/81/82/83/84/85/87"
  	help
  	  If you say Y here you will get support for the ST M41T60
  	  and M41T80 RTC chips series. Currently, the following chips are
! 	  supported: M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84,
  	  M41ST85, and M41ST87.

--- 226,234 ----

  config RTC_DRV_M41T80
! 	tristate "ST M41T62/65/M41T80/81/82/83/84/85/87"
  	help
  	  If you say Y here you will get support for the ST M41T60
  	  and M41T80 RTC chips series. Currently, the following chips are
! 	  supported: M41T62, M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84,
  	  M41ST85, and M41ST87.

***************
*** 441,444 ****
--- 442,455 ----
  	  will be called rtc-ds1742.

+ config RTC_DRV_EFI
+ 	tristate "EFI RTC"
+ 	depends on IA64
+ 	help
+ 	  If you say yes here you will get support for the EFI
+ 	  Real Time Clock.
+ 
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-efi.
+ 
  config RTC_DRV_STK17TA8
  	tristate "Simtek STK17TA8"
***************
*** 563,567 ****
  config RTC_DRV_SH
  	tristate "SuperH On-Chip RTC"
! 	depends on RTC_CLASS && SUPERH
  	help
  	  Say Y here to enable support for the on-chip RTC found in
--- 574,578 ----
  config RTC_DRV_SH
  	tristate "SuperH On-Chip RTC"
! 	depends on RTC_CLASS && SUPERH && HAVE_CLK
  	help
  	  Say Y here to enable support for the on-chip RTC found in
***************
*** 678,697 ****
  	  If you say yes here you get support for the Ricoh RS5C313 RTC chips.

! config RTC_DRV_PARISC
! 	tristate "PA-RISC firmware RTC support"
! 	depends on PARISC
  	help
! 	  Say Y or M here to enable RTC support on PA-RISC systems using
! 	  firmware calls. If you do not know what you are doing, you should
  	  just say Y.

- config RTC_DRV_PPC
-        tristate "PowerPC machine dependent RTC support"
-        depends on PPC
-        help
- 	 The PowerPC kernel has machine-specific functions for accessing
- 	 the RTC. This exposes that functionality through the generic RTC
- 	 class.
- 
  config RTC_DRV_PXA
         tristate "PXA27x/PXA3xx"
--- 689,702 ----
  	  If you say yes here you get support for the Ricoh RS5C313 RTC chips.

! config RTC_DRV_GENERIC
! 	tristate "Generic RTC support"
! 	# Please consider writing a new RTC driver instead of using the generic
! 	# RTC abstraction
! 	depends on PARISC || M68K || PPC
  	help
! 	  Say Y or M here to enable RTC support on systems using the generic
! 	  RTC abstraction. If you do not know what you are doing, you should
  	  just say Y.

  config RTC_DRV_PXA
         tristate "PXA27x/PXA3xx"
***************
*** 737,739 ****
--- 742,753 ----
  	  will be called rtc-mv.

+ config RTC_DRV_PS3
+ 	tristate "PS3 RTC"
+ 	depends on PPC_PS3
+ 	help
+ 	  If you say yes here you will get support for the RTC on PS3.
+ 
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-ps3.
+ 
  endif # RTC_CLASS