* [patch 1/1] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
@ 2008-09-22 21:47 akpm
2008-09-22 21:50 ` Benjamin Herrenschmidt
2008-09-29 4:34 ` Jeff Garzik
0 siblings, 2 replies; 3+ messages in thread
From: akpm @ 2008-09-22 21:47 UTC (permalink / raw)
To: jeff; +Cc: linux-ide, akpm, galak, alan, benh, paulus
From: Kumar Gala <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>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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
--- a/drivers/ata/pata_sil680.c~pata_sil680-convert-config_ppc_merge-to-config_ppc
+++ a/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
_
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 1/1] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
2008-09-22 21:47 [patch 1/1] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC akpm
@ 2008-09-22 21:50 ` Benjamin Herrenschmidt
2008-09-29 4:34 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2008-09-22 21:50 UTC (permalink / raw)
To: akpm; +Cc: jeff, linux-ide, galak, alan, paulus
On Mon, 2008-09-22 at 14:47 -0700, akpm@linux-foundation.org wrote:
> From: Kumar Gala <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>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Cc: Jeff Garzik <jeff@garzik.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 1/1] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
2008-09-22 21:47 [patch 1/1] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC akpm
2008-09-22 21:50 ` Benjamin Herrenschmidt
@ 2008-09-29 4:34 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2008-09-29 4:34 UTC (permalink / raw)
To: akpm; +Cc: linux-ide, galak, alan, benh, paulus
akpm@linux-foundation.org wrote:
> From: Kumar Gala <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>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Cc: Jeff Garzik <jeff@garzik.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> 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
> --- a/drivers/ata/pata_sil680.c~pata_sil680-convert-config_ppc_merge-to-config_ppc
> +++ a/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
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-09-29 4:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-22 21:47 [patch 1/1] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC akpm
2008-09-22 21:50 ` Benjamin Herrenschmidt
2008-09-29 4:34 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).