From a3825d470df132dbe3e021e80ca50e4cf5368b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 12 Nov 2010 08:27:14 +0100 Subject: [PATCH] --- yaml --- r: 226077 b: refs/heads/master c: 86f8efdaab49f5710f0aa3a3c1d76edc1d3d0df9 h: refs/heads/master i: 226075: 9de91d47a5a57b242aa598fb0eb3235b91a1d349 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/mm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c09f6029c95c..ac015ef8028a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7e0951f929513ced7c57882d2f95d49a546e002 +refs/heads/master: 86f8efdaab49f5710f0aa3a3c1d76edc1d3d0df9 diff --git a/trunk/arch/arm/mach-mx3/mm.c b/trunk/arch/arm/mach-mx3/mm.c index 998c3d7f1f22..2e8127150ff1 100644 --- a/trunk/arch/arm/mach-mx3/mm.c +++ b/trunk/arch/arm/mach-mx3/mm.c @@ -79,7 +79,7 @@ void __init mx35_map_io(void) { mxc_set_cpu_type(MXC_CPU_MX35); mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR)); - mxc_arch_reset_init(MX35_IO_ADDRESS(MX3x_WDOG_BASE_ADDR)); + mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR)); iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc)); }