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

[PATCH 8/9] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Kumar Gala
Subject: [PATCH 8/9] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
Date: Wednesday, August 20, 2008 - 9:46 pm

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

--
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, (Wed Aug 20, 9:46 pm)
[PATCH 1/9] usb: remove code associated with !CONFIG_PPC_MERGE, Kumar Gala, (Wed Aug 20, 9:46 pm)
[PATCH 2/9] fs-enet: remove code associated with !CONFIG_P ..., Kumar Gala, (Wed Aug 20, 9:46 pm)
[PATCH 3/9] netdev: drop CONFIG_PPC_MERGE from Kconfig, Kumar Gala, (Wed Aug 20, 9:46 pm)
[PATCH 4/9] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE, Kumar Gala, (Wed Aug 20, 9:46 pm)
[PATCH 5/9] serial/mpc52xx_uart: remove code associated wi ..., Kumar Gala, (Wed Aug 20, 9:46 pm)
[PATCH 6/9] mpc52xx_psc_spi: remove code associated with ! ..., Kumar Gala, (Wed Aug 20, 9:46 pm)
[PATCH 7/9] powerpc: convert CONFIG_PPC_MERGE to CONFIG_PP ..., Kumar Gala, (Wed Aug 20, 9:46 pm)
[PATCH 8/9] pata_sil680: convert CONFIG_PPC_MERGE to CONFI ..., Kumar Gala, (Wed Aug 20, 9:46 pm)
[PATCH 9/9] mtd: remove code associated with !CONFIG_PPC_MERGE, Kumar Gala, (Wed Aug 20, 9:46 pm)
Re: [PATCH 6/9] mpc52xx_psc_spi: remove code associated wi ..., Kumar Gala, (Wed Oct 15, 2:23 pm)
Re: [PATCH 6/9] mpc52xx_psc_spi: remove code associated wi ..., David Brownell, (Wed Oct 15, 2:34 pm)