[PATCH 09/10] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Kumar Gala <galak@kernel.crashing.org>
To: linuxppc-dev@ozlabs.org
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
	jgarzik@pobox.com
Subject: [PATCH 09/10] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
Date: Fri,  1 Aug 2008 11:44:19 -0500	[thread overview]
Message-ID: <1217609060-6381-10-git-send-email-galak@kernel.crashing.org> (raw)
In-Reply-To: <1217609060-6381-9-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 CONFIG_PPC_MERGE use
CONFIG_PPC instead.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 drivers/ata/pata_sil680.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 720b864..9655511 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -230,7 +230,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
 		tmpbyte & 1, tmpbyte & 0x30);
 
 	*try_mmio = 0;
-#ifdef CONFIG_PPC_MERGE
+#ifdef CONFIG_PPC
 	if (machine_is(cell))
 		*try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
 #endif
-- 
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-ide@vger.kernel.org, jgarzik@pobox.com,
	linux-kernel@vger.kernel.org
Subject: [PATCH 09/10] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
Date: Fri,  1 Aug 2008 11:44:19 -0500	[thread overview]
Message-ID: <1217609060-6381-10-git-send-email-galak@kernel.crashing.org> (raw)
In-Reply-To: <1217609060-6381-9-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 CONFIG_PPC_MERGE use
CONFIG_PPC instead.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 drivers/ata/pata_sil680.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 720b864..9655511 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -230,7 +230,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
 		tmpbyte & 1, tmpbyte & 0x30);
 
 	*try_mmio = 0;
-#ifdef CONFIG_PPC_MERGE
+#ifdef CONFIG_PPC
 	if (machine_is(cell))
 		*try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
 #endif
-- 
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: linux-ide@vger.kernel.org
Cc: jgarzik@pobox.com
Subject: [PATCH 09/10] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
Date: Fri,  1 Aug 2008 11:44:19 -0500	[thread overview]
Message-ID: <1217609060-6381-10-git-send-email-galak@kernel.crashing.org> (raw)
In-Reply-To: <1217609060-6381-9-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 CONFIG_PPC_MERGE use
CONFIG_PPC instead.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 drivers/ata/pata_sil680.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 720b864..9655511 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -230,7 +230,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
 		tmpbyte & 1, tmpbyte & 0x30);
 
 	*try_mmio = 0;
-#ifdef CONFIG_PPC_MERGE
+#ifdef CONFIG_PPC
 	if (machine_is(cell))
 		*try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
 #endif
-- 
1.5.5.1

next prev parent 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         ` [PATCH 05/10] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44           ` 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                 ` Kumar Gala [this message]
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                   ` [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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:720b864 dfblob:9655511 dfblob:720b864 dfblob:9655511
dfblob:720b864 dfblob:9655511 )
 OR (
bs:"[PATCH 09/10] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC" )
	(help)

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-10-git-send-email-galak@kernel.crashing.org \
    --to=galak@kernel.crashing.org \
    --cc=jgarzik@pobox.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    /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.