From: Jeff Garzik <jeff@garzik.org>
To: akpm@linux-foundation.org
Cc: linux-ide@vger.kernel.org, galak@kernel.crashing.org,
alan@lxorguk.ukuu.org.uk, benh@kernel.crashing.org,
paulus@samba.org
Subject: Re: [patch 1/1] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
Date: Mon, 29 Sep 2008 00:34:12 -0400 [thread overview]
Message-ID: <48E05AC4.40405@garzik.org> (raw)
In-Reply-To: <200809222147.m8MLlXSa031665@imap1.linux-foundation.org>
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
prev parent reply other threads:[~2008-09-29 4:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=48E05AC4.40405@garzik.org \
--to=jeff@garzik.org \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=benh@kernel.crashing.org \
--cc=galak@kernel.crashing.org \
--cc=linux-ide@vger.kernel.org \
--cc=paulus@samba.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.