diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-09-12 11:43:46 +0159 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-09-12 11:43:46 +0159 |
| commit | 2558bc296738bec7ff9572d285811d946b61b091 (patch) | |
| tree | a658ab3c954cb45f8a95350f69cd37defa6defd7 | |
| parent | c2b1d023576d466234839bf0f9de7bd9fa5aba80 (diff) | |
| download | imx53-2558bc296738bec7ff9572d285811d946b61b091.tar.gz | |
Fix syntax error left over from bogus merge
| -rw-r--r-- | arch/arm/mach-mx5/mm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c index 808ab117336..f6634595ff3 100644 --- a/arch/arm/mach-mx5/mm.c +++ b/arch/arm/mach-mx5/mm.c @@ -168,5 +168,4 @@ void __init imx53_soc_init(void) /* i.mx53 has the i.mx35 type sdma */ imx_add_imx_sdma("imx35-sdma", MX53_SDMA_BASE_ADDR, MX53_INT_SDMA, &imx53_sdma_pdata); ->>>>>>> 24f71b5... mx5: rename MX51_MXC_INT_* to MX51_INT_* to be more consistent } |