Skip to contentSkip to conversation

pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC

PATCH Applied [email protected] 3 participants 3 messages Sep 22, 2008 – Sep 29, 2008 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC

From: Kumar Gala <[email protected]>

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.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Alan Cox <[email protected]>
Cc Jeff Garzik <[email protected]>

---

 drivers/ata/pata_sil680.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/pata_sil680.c renamed from drivers/ata/pata_sil680.c~pata_sil680-convert-config_ppc_merge-to-config_ppc +1 -1
diff -puN drivers/ata/pata_sil680.c~pata_sil680-convert-config_ppc_merge-to-config_ppc drivers/ata/pata_sil680.c
@@ -230,7 +230,7 @@ static u8 sil680_init_chip(struct pci_de
 		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

_

Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · On Mon, 2008-09-22 at 14:47 -0700, [email protected] wrote:

From: Kumar Gala <[email protected]>

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.

Quoted 5 lines
Cc Paul Mackerras <[email protected]>
Cc Alan Cox <[email protected]>
Cc Jeff Garzik <[email protected]>

---

Applied
#2 lore raw
In reply to [email protected]
Quoted 21 lines · [email protected] wrote:

From: Kumar Gala <[email protected]>

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.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Alan Cox <[email protected]>
Cc Jeff Garzik <[email protected]>

---

 drivers/ata/pata_sil680.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/ata/pata_sil680.c~pata_sil680-convert-config_ppc_merge-to-config_ppc drivers/ata/pata_sil680.c

drivers/ata/pata_sil680.c static u8 sil680_init_chip(struct pci_de · line 236

Quoted 8 lines
drivers/ata/pata_sil680.c renamed from drivers/ata/pata_sil680.c~pata_sil680-convert-config_ppc_merge-to-config_ppc +1 -1
@@ -230,7 +230,7 @@ static u8 sil680_init_chip(struct pci_de
 		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

applied