diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-15 16:49:31 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-15 16:49:31 +0100 |
| commit | 590a94d93475fa6cca257f161ae268ed3a2395b5 (patch) | |
| tree | d08735ef1dc8260e73f6e95832bfa90d172a7a4a /arch/arm/plat-mxc/include/mach/iomux.h | |
| parent | 6973ee7e602b08f624bbf7379b6f68054c71aebb (diff) | |
| parent | c35d3a418149f145ff0d90833db3e298e88de1ad (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/iomux.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux.h b/arch/arm/plat-mxc/include/mach/iomux.h index 171f8adc1109..6d49f8ae3259 100644 --- a/arch/arm/plat-mxc/include/mach/iomux.h +++ b/arch/arm/plat-mxc/include/mach/iomux.h @@ -49,6 +49,9 @@ #ifdef CONFIG_ARCH_MX2 # define GPIO_PORT_MAX 5 #endif +#ifdef CONFIG_ARCH_MX25 +# define GPIO_PORT_MAX 3 +#endif #ifndef GPIO_PORT_MAX # error "GPIO config port count unknown!" @@ -107,6 +110,9 @@ #include <mach/iomux-mx27.h> #endif #endif +#ifdef CONFIG_ARCH_MX25 +#include <mach/iomux-mx25.h> +#endif /* decode irq number to use with IMR(x), ISR(x) and friends */ |