diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-08 09:33:44 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-08 09:33:44 -0800 |
commit | 990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d (patch) | |
tree | b0f6c896749f5beca20d74e72e4761aaa9e8ad2b /arch/arm/mach-lpc32xx/include/mach/irqs.h | |
parent | 3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c (diff) | |
parent | 8a16a701ad787b6db2949766341c5ad1b551de9f (diff) | |
download | linux-stable-990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d.tar.gz linux-stable-990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d.tar.bz2 linux-stable-990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d.zip |
Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers
* 'regulator' of git://github.com/hzhuang1/linux: (2 commits)
regulator: Remove bq24022 regulator driver
pxa: magician/hx4700: Convert to gpio-regulator from bq24022
(plus update to v3.3-rc6)
Diffstat (limited to 'arch/arm/mach-lpc32xx/include/mach/irqs.h')
-rw-r--r-- | arch/arm/mach-lpc32xx/include/mach/irqs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-lpc32xx/include/mach/irqs.h b/arch/arm/mach-lpc32xx/include/mach/irqs.h index 2667f52e3b04..9e3b90df32e1 100644 --- a/arch/arm/mach-lpc32xx/include/mach/irqs.h +++ b/arch/arm/mach-lpc32xx/include/mach/irqs.h @@ -61,7 +61,7 @@ */ #define IRQ_LPC32XX_JTAG_COMM_TX LPC32XX_SIC1_IRQ(1) #define IRQ_LPC32XX_JTAG_COMM_RX LPC32XX_SIC1_IRQ(2) -#define IRQ_LPC32XX_GPI_11 LPC32XX_SIC1_IRQ(4) +#define IRQ_LPC32XX_GPI_28 LPC32XX_SIC1_IRQ(4) #define IRQ_LPC32XX_TS_P LPC32XX_SIC1_IRQ(6) #define IRQ_LPC32XX_TS_IRQ LPC32XX_SIC1_IRQ(7) #define IRQ_LPC32XX_TS_AUX LPC32XX_SIC1_IRQ(8) |