diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-10-16 01:03:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:40 -0400 |
| commit | 03274572215a1dfc7c382ef9b18c562612b4d466 (patch) | |
| tree | 08964e93f3c9a974d865af36840cffd7637e93cd /drivers/rtc | |
| parent | 743e6a504f81d1e2f086e726b69fb6631d11f820 (diff) | |
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>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 16bc33cbadf5..1a9459615c39 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -612,7 +612,7 @@ config RTC_DRV_RS5C313 | |||
| 612 | 612 | ||
| 613 | config RTC_DRV_PPC | 613 | config RTC_DRV_PPC |
| 614 | tristate "PowerPC machine dependent RTC support" | 614 | tristate "PowerPC machine dependent RTC support" |
| 615 | depends on PPC_MERGE | 615 | depends on PPC |
| 616 | help | 616 | help |
| 617 | The PowerPC kernel has machine-specific functions for accessing | 617 | The PowerPC kernel has machine-specific functions for accessing |
| 618 | the RTC. This exposes that functionality through the generic RTC | 618 | the RTC. This exposes that functionality through the generic RTC |