---

yaml --- r: 114813 b: refs/heads/master c: 0327457 h: refs/heads/master i: 114811: 54a710a v: v3
git-mirror · Oct 16, 2008 · 996e872 · 996e872
1 parent e1e3e12
commit 996e872
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 743e6a504f81d1e2f086e726b69fb6631d11f820
+refs/heads/master: 03274572215a1dfc7c382ef9b18c562612b4d466
diff --git a/trunk/drivers/rtc/Kconfig b/trunk/drivers/rtc/Kconfig
@@ -612,7 +612,7 @@ config RTC_DRV_RS5C313
 
 config RTC_DRV_PPC
        tristate "PowerPC machine dependent RTC support"
-       depends on PPC_MERGE
+       depends on PPC
        help
 	 The PowerPC kernel has machine-specific functions for accessing
 	 the RTC. This exposes that functionality through the generic RTC