All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kumar Gala <galak@kernel.crashing.org>
To: linuxppc-dev@ozlabs.org
Cc: a.zummo@towertech.it, linux-kernel@vger.kernel.org,
	rtc-linux@googlegroups.com
Subject: [PATCH 05/10] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE
Date: Fri,  1 Aug 2008 11:44:15 -0500	[thread overview]
Message-ID: <1217609060-6381-6-git-send-email-galak@kernel.crashing.org> (raw)
In-Reply-To: <1217609060-6381-5-git-send-email-galak@kernel.crashing.org>

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 90ab738..564a3ed 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

WARNING: multiple messages have this Message-ID (diff)
From: Kumar Gala <galak@kernel.crashing.org>
To: linuxppc-dev@ozlabs.org
Cc: linux-kernel@vger.kernel.org
Cc: rtc-linux@googlegroups.com
Cc: a.zummo@towertech.it
Subject: [PATCH 05/10] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE
Date: Fri,  1 Aug 2008 11:44:15 -0500	[thread overview]
Message-ID: <1217609060-6381-6-git-send-email-galak@kernel.crashing.org> (raw)
In-Reply-To: <1217609060-6381-5-git-send-email-galak@kernel.crashing.org>

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 90ab738..564a3ed 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


  reply	other threads:[~2008-08-01 16:44 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-01 16:44 [PATCH 00/10] powerpc: Remove use of CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44 ` [PATCH 01/10] " Kumar Gala
2008-08-01 16:44   ` [PATCH 02/10] usb: remove code associated with !CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44     ` Kumar Gala
2008-08-01 16:44     ` [PATCH 03/10] fs-enet: " Kumar Gala
2008-08-01 16:44       ` Kumar Gala
2008-08-01 16:44       ` [PATCH 04/10] netdev: drop CONFIG_PPC_MERGE from Kconfig Kumar Gala
2008-08-01 16:44         ` Kumar Gala
2008-08-01 16:44         ` Kumar Gala [this message]
2008-08-01 16:44           ` [PATCH 05/10] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44           ` [PATCH 06/10] serial/mpc52xx_uart: remove code associated with !CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44             ` Kumar Gala
2008-08-01 16:44             ` [PATCH 07/10] mpc52xx_psc_spi: " Kumar Gala
2008-08-01 16:44               ` Kumar Gala
2008-08-01 16:44               ` [PATCH 08/10] powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks Kumar Gala
2008-08-01 16:44                 ` [PATCH 09/10] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC Kumar Gala
2008-08-01 16:44                   ` Kumar Gala
2008-08-01 16:44                   ` Kumar Gala
2008-08-01 16:44                   ` [PATCH 10/10] mtd: remove code associated with !CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44                     ` Kumar Gala
2008-08-01 17:49                     ` Josh Boyer
2008-08-01 17:49                       ` Josh Boyer
2008-08-01 18:57       ` [PATCH 03/10] fs-enet: " Scott Wood
2008-08-01 18:57         ` Scott Wood
2008-08-02  2:38   ` [PATCH 01/10] powerpc: Remove use of CONFIG_PPC_MERGE Michael Ellerman
2008-08-01 23:53 ` [PATCH 00/10] " Paul Mackerras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1217609060-6381-6-git-send-email-galak@kernel.crashing.org \
    --to=galak@kernel.crashing.org \
    --cc=a.zummo@towertech.it \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=rtc-linux@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.