From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO
Date: Tue, 5 Jul 2011 11:03:55 +0100 [thread overview]
Message-ID: <20110705100355.GS8286@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <CAMPhdO-xQ614Rs-tTEY0v7i6_Q=aNUtoCo3AZ33nc1LsKoTn4w@mail.gmail.com>
On Tue, Jul 05, 2011 at 03:46:12PM +0800, Eric Miao wrote:
> On Thu, Apr 21, 2011 at 9:57 PM, Philipp Zabel <pzabel@gmx.de> wrote:
> > Commit a0a4dcbca73a418477f439e812193e2591b46751
> > "ARM: pxa: align NR_BUILTIN_GPIO with GPIO interrupt number"
> > increased NR_BUILTIN_GPIO from 128 to PXA_GPIO_IRQ_NUM (192).
> > Adjust the previously hardcoded MAGICIAN_EGPIO_BASE accordingly.
> >
> > Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
>
> Applied.
>
> > ---
> > ?arch/arm/mach-pxa/include/mach/magician.h | ? ?3 ++-
> > ?1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h
> > index 0a2efcf..e9e6162 100644
> > --- a/arch/arm/mach-pxa/include/mach/magician.h
> > +++ b/arch/arm/mach-pxa/include/mach/magician.h
> > @@ -12,6 +12,7 @@
> > ?#ifndef _MAGICIAN_H_
> > ?#define _MAGICIAN_H_
> >
> > +#include <mach/gpio.h>
Note that there's yet another mach/gpio.h here.
next prev parent reply other threads:[~2011-07-05 10:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-21 13:57 [PATCH] pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO Philipp Zabel
2011-07-05 7:46 ` Eric Miao
2011-07-05 10:03 ` Russell King - ARM Linux [this message]
2011-07-05 14:29 ` Eric Miao
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=20110705100355.GS8286@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 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.