Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258645
b: refs/heads/master
c: 187e5f2
h: refs/heads/master
i:
  258643: b29bda2
v: v3
  • Loading branch information
Shawn Guo authored and Sascha Hauer committed Jul 7, 2011
1 parent e090ea3 commit 4d84626
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ee8814db9642713982e793cf3ae48ac0aef58433
refs/heads/master: 187e5f26a853448add574b7efaba3767267dbc15
4 changes: 2 additions & 2 deletions trunk/arch/arm/plat-mxc/devices/platform-imx-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4d84626

Please sign in to comment.