diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-29 14:29:51 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-29 14:29:51 -0700 |
| commit | b6e3b5c2fea9c76617e101cbbc54ed14961f9dee (patch) | |
| tree | ce64a0104633228fc32614b72f25557d94403b04 /arch/arm/mach-lpc32xx/include | |
| parent | 28901c1fed11dfeab65f640878e85a9b61d311ed (diff) | |
| parent | 8e4b97e3b8fd6a7f86bf8b38e7975549f2c48a78 (diff) | |
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
From Roland Stigge, three more updates to lpc32xx.
* 'lpc32xx/core' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Support GPI 28
ARM: LPC32xx: Platform update for devicetree completion of spi-pl022
ARM: LPC32xx: Board cleanup
Diffstat (limited to 'arch/arm/mach-lpc32xx/include')
| -rw-r--r-- | arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h b/arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h index 1816e22a3479..a544e962a818 100644 --- a/arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h +++ b/arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h @@ -30,7 +30,7 @@ #define LPC32XX_GPIO_P1_MAX 24 #define LPC32XX_GPIO_P2_MAX 13 #define LPC32XX_GPIO_P3_MAX 6 -#define LPC32XX_GPI_P3_MAX 28 +#define LPC32XX_GPI_P3_MAX 29 #define LPC32XX_GPO_P3_MAX 24 #define LPC32XX_GPIO_P0_GRP 0 |