From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: integrator: fix typo in PCI swizzle function
Date: Sat, 12 May 2012 10:40:03 +0100 [thread overview]
Message-ID: <20120512094003.GA10453@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1336813546-25766-1-git-send-email-linus.walleij@linaro.org>
On Sat, May 12, 2012 at 11:05:46AM +0200, Linus Walleij wrote:
> The next tree didn't compile due to a typo in commit
> cfb32a689949d09f112493de4a1e3e5900db2053
> "ARM: PCI: integrator: use common PCI swizzle"
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Do you want me to merge this into the original commit?
> ---
> arch/arm/mach-integrator/pci.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-integrator/pci.c b/arch/arm/mach-integrator/pci.c
> index 40f4b4f..6c1667e 100644
> --- a/arch/arm/mach-integrator/pci.c
> +++ b/arch/arm/mach-integrator/pci.c
> @@ -73,7 +73,7 @@ static u8 __init integrator_swizzle(struct pci_dev *dev, u8 *pinp)
> if (*pinp == 0)
> *pinp = 1;
>
> - return pci_std_swizzle(dev, pinp);
> + return pci_common_swizzle(dev, pinp);
> }
>
> static int irq_tab[4] __initdata = {
> --
> 1.7.7.6
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2012-05-12 9:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-12 9:05 [PATCH] ARM: integrator: fix typo in PCI swizzle function Linus Walleij
2012-05-12 9:40 ` Russell King - ARM Linux [this message]
2012-05-12 23:06 ` Linus Walleij
2012-05-13 16:04 ` Paul Gortmaker
2012-05-13 16:09 ` Russell King - ARM Linux
2012-05-13 19:59 ` Paul Gortmaker
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=20120512094003.GA10453@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.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 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).