---

yaml --- r: 58880 b: refs/heads/master c: fdc1f93 h: refs/heads/master v: v3
git-mirror · Jul 12, 2007 · dc2c2a1 · dc2c2a1
1 parent c74f6af
commit dc2c2a1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 77 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f2c6d6b0c553e44273aaee24820c67ebfbbfebe
+refs/heads/master: fdc1f93847ea618e51f001805e022794d8bffff3
diff --git a/trunk/arch/mips/configs/yosemite_defconfig b/trunk/arch/mips/configs/yosemite_defconfig
@@ -592,8 +592,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set

diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
@@ -815,7 +815,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
 	tristate "Generic /dev/rtc emulation"
-	depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390 && !SUPERH
+	depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH
 	---help---
 	  If you say Y here and create a character special file /dev/rtc with
 	  major number 10 and minor number 135 using mknod ("man mknod"), you

diff --git a/trunk/include/asm-mips/rtc.h b/trunk/include/asm-mips/rtc.h