diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-15 12:11:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-15 12:11:51 +0100 |
| commit | e85d380710680cb5793fcb59e03b7904b07a1e19 (patch) | |
| tree | 6b65169c77da7fbaaf1ddc3fa53bf11c12064ea9 /arch/arm/mach-mx3/mm.c | |
| parent | 3d977c012f1af4a867939fa21ad502d5279fa0a0 (diff) | |
| parent | 679bfef0e366109483981899401b98b8a65ed06c (diff) | |
Merge branch 'for-rmk-rc' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx3/mm.c')
| -rw-r--r-- | arch/arm/mach-mx3/mm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c index ad5a1122d76..bedf5b8d976 100644 --- a/arch/arm/mach-mx3/mm.c +++ b/arch/arm/mach-mx3/mm.c @@ -81,6 +81,7 @@ void __init mx31_map_io(void) iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc)); } +#ifdef CONFIG_ARCH_MX35 void __init mx35_map_io(void) { mxc_set_cpu_type(MXC_CPU_MX35); @@ -89,6 +90,7 @@ void __init mx35_map_io(void) iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc)); } +#endif void __init mx31_init_irq(void) { |