Commit 03274572 authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds

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: default avatarKumar 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 743e6a50
...@@ -612,7 +612,7 @@ config RTC_DRV_RS5C313 ...@@ -612,7 +612,7 @@ config RTC_DRV_RS5C313
config RTC_DRV_PPC config RTC_DRV_PPC
tristate "PowerPC machine dependent RTC support" tristate "PowerPC machine dependent RTC support"
depends on PPC_MERGE depends on PPC
help help
The PowerPC kernel has machine-specific functions for accessing The PowerPC kernel has machine-specific functions for accessing
the RTC. This exposes that functionality through the generic RTC the RTC. This exposes that functionality through the generic RTC
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment