From 4d84626fb3ab825d2cb04742f82a10c5b75262f7 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Wed, 22 Jun 2011 22:41:29 +0800 Subject: [PATCH] --- yaml --- r: 258645 b: refs/heads/master c: 187e5f26a853448add574b7efaba3767267dbc15 h: refs/heads/master i: 258643: b29bda28d9f2bbe4d72521b09bf3a3c616ce334c v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/devices/platform-imx-dma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 861cf81cc985..128f694d97d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee8814db9642713982e793cf3ae48ac0aef58433 +refs/heads/master: 187e5f26a853448add574b7efaba3767267dbc15 diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx-dma.c b/trunk/arch/arm/plat-mxc/devices/platform-imx-dma.c index c2712b7047fd..c64f015e031b 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx-dma.c +++ b/trunk/arch/arm/plat-mxc/devices/platform-imx-dma.c @@ -77,7 +77,7 @@ static struct platform_device __init __maybe_unused *imx_add_imx_dma(void) } #ifdef CONFIG_ARCH_MX25 -static struct sdma_script_start_addrs addr_imx25_to1 = { +static struct sdma_script_start_addrs addr_imx25 = { .ap_2_ap_addr = 729, .uart_2_mcu_addr = 904, .per_2_app_addr = 1255, @@ -165,7 +165,7 @@ static int __init imxXX_add_imx_dma(void) #if defined(CONFIG_SOC_IMX25) if (cpu_is_mx25()) { - imx25_imx_sdma_data.pdata.script_addrs = &addr_imx25_to1; + imx25_imx_sdma_data.pdata.script_addrs = &addr_imx25; ret = imx_add_imx_sdma(&imx25_imx_sdma_data); } else #endif