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 /common/console.c | |
| 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 'common/console.c')
| -rw-r--r-- | common/console.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/console.c b/common/console.c index 1518ed885f..6ca94e2a02 100644 --- a/common/console.c +++ b/common/console.c @@ -93,9 +93,9 @@ static int console_std_set(struct device_d *dev, struct param_d *param, if (initialized < CONSOLE_INIT_FULL) { char ch; initialized = CONSOLE_INIT_FULL; - PUTS_LL("Switch to console ["); - PUTS_LL(dev_name(dev)); - PUTS_LL("]\n"); + puts_ll("Switch to console ["); + puts_ll(dev_name(dev)); + puts_ll("]\n"); barebox_banner(); while (kfifo_getc(console_output_fifo, &ch) == 0) console_putc(CONSOLE_STDOUT, ch); @@ -286,7 +286,7 @@ void console_putc(unsigned int ch, char c) case CONSOLE_INITIALIZED_BUFFER: kfifo_putc(console_output_fifo, c); - PUTC_LL(c); + putc_ll(c); return; case CONSOLE_INIT_FULL: |