From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 16 Oct 2008 05:03:06 +0000 (-0700)
Subject: rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE
X-Git-Tag: v2.6.28-rc1~433
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=03274572215a1dfc7c382ef9b18c562612b4d466;p=linux-2.6-omap-h63xx.git

rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE

Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all
powerpc platforms and we want to get rid of it use CONFIG_PPC instead.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 16bc33cbadf..1a9459615c3 100644
--- a/drivers/rtc/Kconfig
+++ b/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