From 996e87263c7835799a02be97b5f1f9d86bde9b1a Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Wed, 15 Oct 2008 22:03:06 -0700
Subject: [PATCH] --- yaml --- r: 114813 b: refs/heads/master c:
 03274572215a1dfc7c382ef9b18c562612b4d466 h: refs/heads/master i:   114811:
 54a710a06c44c3c91d8d9f20fd8c83840ce3dcd3 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/rtc/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e96f87f16bfd..8b026cdb6a23 100644
--- 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
index 16bc33cbadf5..1a9459615c39 100644
--- 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