Update of /cvsroot/gc-linux/linux/drivers/rtc
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/rtc
Modified Files:
Kconfig Makefile
Log Message:
Merge v2.6.32.
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile 9 Dec 2009 18:40:10 -0000 1.14
--- Makefile 9 Dec 2009 18:44:55 -0000 1.15
***************
*** 44,47 ****
--- 44,48 ----
obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o
obj-$(CONFIG_RTC_DRV_GENERIC) += rtc-generic.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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Kconfig 9 Dec 2009 18:40:10 -0000 1.14
--- Kconfig 9 Dec 2009 18:44:55 -0000 1.15
***************
*** 574,577 ****
--- 574,586 ----
support. This chip contains a battery- and capacitor-backed RTC.
+ 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"
|
