diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:40:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:40:04 +0200 |
| commit | 7f6b6d25d899fea83412255d1d819e3b6450f144 (patch) | |
| tree | 4da546d3b4045c842af7ccad3004c6476cb4d523 /arch/arm/boards/tqma6x | |
| parent | 1729b1798e1bfd4614a9cf7cf651cee8b6923283 (diff) | |
| parent | f1cf4433bfc2d2e7bfdab8eacc401a0ccf2fe08d (diff) | |
| download | barebox-7f6b6d25d899fea83412255d1d819e3b6450f144.tar.gz barebox-7f6b6d25d899fea83412255d1d819e3b6450f144.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
arch/arm/boards/pcm051/env/config
Diffstat (limited to 'arch/arm/boards/tqma6x')
| -rw-r--r-- | arch/arm/boards/tqma6x/lowlevel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boards/tqma6x/lowlevel.c b/arch/arm/boards/tqma6x/lowlevel.c index 8c8684123a..8a16abba3a 100644 --- a/arch/arm/boards/tqma6x/lowlevel.c +++ b/arch/arm/boards/tqma6x/lowlevel.c @@ -54,7 +54,7 @@ ENTRY_FUNCTION(start_imx6q_mba6x)(void) if (IS_ENABLED(CONFIG_DEBUG_LL)) { writel(0x2, 0x020e0338); setup_uart(); - PUTC_LL('a'); + putc_ll('a'); } arm_early_mmu_cache_invalidate(); @@ -77,7 +77,7 @@ ENTRY_FUNCTION(start_imx6dl_mba6x)(void) if (IS_ENABLED(CONFIG_DEBUG_LL)) { writel(0x2, 0x020e035c); setup_uart(); - PUTC_LL('a'); + putc_ll('a'); } arm_early_mmu_cache_invalidate(); |