Home » Mailing list archives » linux-kernel » 2008 » August » 21

[PATCH 4/9] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Kumar Gala <galak@...>
To: <linux-kernel@...>
Cc: <akpm@...>, <rtc-linux@...>, <a.zummo@...>
Subject: [PATCH 4/9] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE
Date: Thursday, August 21, 2008 - 12:46 am

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>
---
 drivers/rtc/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 9a9755c..fd32828 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -577,7 +577,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
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/08] powerpc: Remove use of CONFIG_PPC_MERGE, Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 1/9] usb: remove code associated with !CONFIG_PPC_MERGE, Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 2/9] fs-enet: remove code associated with !CONFIG_PPC..., Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 3/9] netdev: drop CONFIG_PPC_MERGE from Kconfig, Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 4/9] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE, Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 5/9] serial/mpc52xx_uart: remove code associated with..., Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 6/9] mpc52xx_psc_spi: remove code associated with !CO..., Kumar Gala, (Thu Aug 21, 12:46 am)
Re: [PATCH 6/9] mpc52xx_psc_spi: remove code associated with..., Kumar Gala, (Wed Oct 15, 5:23 pm)
Re: [PATCH 6/9] mpc52xx_psc_spi: remove code associated with..., David Brownell, (Wed Oct 15, 5:34 pm)
[PATCH 7/9] powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC ..., Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 8/9] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_..., Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 9/9] mtd: remove code associated with !CONFIG_PPC_MERGE, Kumar Gala, (Thu Aug 21, 12:46 am)