From: Stefan Roese <sr@denx.de>
Date: Wed, 6 Aug 2008 12:06:03 +0000 (+0200)
Subject: Fix merge problems
X-Git-Tag: v2008.10-rc1~184
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1318673045fe188c6e24c582b1e6efc00ae1c62c;p=u-boot

Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
---

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
 }