diff options
| author | Alan Tull <r80115@freescale.com> | 2010-09-23 14:17:05 -0500 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2010-12-13 16:09:29 -0500 |
| commit | 2f823fd97b1c52aafb4f07c5330f549d1c981385 (patch) | |
| tree | 50c15ebce0b7c9719989f0c7887befb4ca3b72c0 /arch/arm/plat-mxc/include/mach/mxc.h | |
| parent | 04fd8487ba25200508085cab0438066fd011e533 (diff) | |
ENGR00131832-1 MX25: Upgrade kernel to 2.6.35
This patch contains changes to mach-mx25 files.
Contains all checkpatch and copyright fixes.
Signed-off-by: Alan Tull <r80115@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mxc.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h index 1b274a01cd5a..f2b960865a37 100644 --- a/arch/arm/plat-mxc/include/mach/mxc.h +++ b/arch/arm/plat-mxc/include/mach/mxc.h @@ -236,7 +236,7 @@ struct mxc_unifi_platform_data *get_unifi_plat_data(void); #define MUX_IO_P 29 #define MUX_IO_I 24 -#ifdef CONFIG_ARCH_MX5 +#if defined(CONFIG_ARCH_MX5) || defined(CONFIG_ARCH_MX25) #define IOMUX_TO_GPIO(pin) ((((unsigned int)pin >> MUX_IO_P) * 32) + ((pin >> MUX_IO_I) & ((1 << (MUX_IO_P - MUX_IO_I)) - 1))) #define IOMUX_TO_IRQ(pin) (MXC_GPIO_IRQ_START + IOMUX_TO_GPIO(pin)) #endif |