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

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

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

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


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/rtc/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
***************
*** 40,43 ****
--- 40,44 ----
  obj-$(CONFIG_RTC_DRV_EP93XX)	+= rtc-ep93xx.o
  obj-$(CONFIG_RTC_DRV_FM3130)	+= rtc-fm3130.o
+ obj-$(CONFIG_RTC_DRV_GCN)	+= rtc-gcn.o
  obj-$(CONFIG_RTC_DRV_ISL1208)	+= rtc-isl1208.o
  obj-$(CONFIG_RTC_DRV_M41T80)	+= rtc-m41t80.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.11
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 536,539 ****
--- 536,549 ----
  	  NXP PCF50633 used in embedded systems.
  
+ config RTC_DRV_GCN
+ 	bool "Nintendo GameCube/Wii Real Time Clock and SRAM"
+ 	depends on GAMECUBE_EXI
+ 	default y
+ 	help
+ 	  If you say yes to this option, support will be included for the
+ 	  Real Time Clock and SRAM of the Nintendo GameCube/Wii.
+ 
+ 	  If in doubt, say Y here.
+ 
  comment "on-CPU RTC drivers"