diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-18 22:15:48 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-18 22:15:48 +0000 |
commit | 0bd5292f5883d24b9416ba32a2a137482d7f380b (patch) | |
tree | 8bd6eeb95445d1372f5735bccc22e8e4417a2cf4 /arch/arm/plat-mxc/include/mach/gpio.h | |
parent | fdb0a1a67e131f07a308730c80d07e330211d2e0 (diff) | |
parent | a2449091522990e9746a3f1420b9041d9669590c (diff) | |
download | linux-0bd5292f5883d24b9416ba32a2a137482d7f380b.tar.gz linux-0bd5292f5883d24b9416ba32a2a137482d7f380b.tar.bz2 linux-0bd5292f5883d24b9416ba32a2a137482d7f380b.zip |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/gpio.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/gpio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h index 65eedc0d196f..ea509f1090fb 100644 --- a/arch/arm/plat-mxc/include/mach/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h @@ -27,8 +27,8 @@ #define gpio_set_value __gpio_set_value #define gpio_cansleep __gpio_cansleep -#define gpio_to_irq(gpio) (MXC_MAX_INT_LINES + (gpio)) -#define irq_to_gpio(irq) ((irq) - MXC_MAX_INT_LINES) +#define gpio_to_irq(gpio) (MXC_GPIO_IRQ_START + (gpio)) +#define irq_to_gpio(irq) ((irq) - MXC_GPIO_IRQ_START) struct mxc_gpio_port { void __iomem *base; |