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/iomux-mx3.h | |
| parent | fdb0a1a67e131f07a308730c80d07e330211d2e0 (diff) | |
| parent | a2449091522990e9746a3f1420b9041d9669590c (diff) | |
| download | op-kernel-dev-0bd5292f5883d24b9416ba32a2a137482d7f380b.zip op-kernel-dev-0bd5292f5883d24b9416ba32a2a137482d7f380b.tar.gz | |
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/iomux-mx3.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx3.h b/arch/arm/plat-mxc/include/mach/iomux-mx3.h index 20e5c4c..c9198c0 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx3.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx3.h @@ -141,7 +141,7 @@ void mxc_iomux_set_gpr(enum iomux_gp_func, bool); ((iomux_pin & IOMUX_GPIONUM_MASK) >> IOMUX_GPIONUM_SHIFT) #define IOMUX_TO_IRQ(iomux_pin) \ (((iomux_pin & IOMUX_GPIONUM_MASK) >> IOMUX_GPIONUM_SHIFT) + \ - MXC_GPIO_INT_BASE) + MXC_GPIO_IRQ_START) /* * This enumeration is constructed based on the Section |
