[PATCH] pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO

[Russell King - ARM Linux]

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 at 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 at 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.