diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-06 14:06:03 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-06 14:06:03 +0200 |
| commit | 1318673045fe188c6e24c582b1e6efc00ae1c62c (patch) | |
| tree | 7d427072e01e415247c2bca9a6970e9901de66ac | |
| parent | f2302d4430e7f3f48308d6a585320fe96af8afbd (diff) | |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | drivers/serial/serial_xuartlite.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index ef6371e66e..00d0eaac75 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -54,13 +54,8 @@ void serial_putc(const char c) { if (c == '\n') serial_putc('\r'); -<<<<<<< .merge_file_kaofiJ - while (in_be32((void *)UARTLITE_STATUS) & SR_TX_FIFO_FULL); - out_be32((void *)UARTLITE_TX_FIFO, (unsigned char) (c & 0xff)); -======= while (in_be32((u32 *) UARTLITE_STATUS) & SR_TX_FIFO_FULL); out_be32((u32 *) UARTLITE_TX_FIFO, (unsigned char) (c & 0xff)); ->>>>>>> .merge_file_zSz9BG } void serial_puts(const char * s) @@ -72,20 +67,11 @@ void serial_puts(const char * s) int serial_getc(void) { -<<<<<<< .merge_file_kaofiJ - while (!(in_be32((void *)UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA)); - return in_be32((void *)UARTLITE_RX_FIFO) & 0xff; -======= while (!(in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA)); return in_be32((u32 *) UARTLITE_RX_FIFO) & 0xff; ->>>>>>> .merge_file_zSz9BG } int serial_tstc(void) { -<<<<<<< .merge_file_kaofiJ - return (in_be32((void *)UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA); -======= return (in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA); ->>>>>>> .merge_file_zSz9BG } |