From: Stefan Roese <sr@denx.de>
Date: Tue, 14 Aug 2007 13:12:01 +0000 (+0200)
Subject: POST: Fix merge problem
X-Git-Tag: v1.3.0-rc1~19^2~17^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4ce846ec59f36b85d6644a769690ad3feb667575;p=u-boot

POST: Fix merge problem

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

diff --git a/post/cpu/ppc4xx/uart.c b/post/cpu/ppc4xx/uart.c
index 5f14967fee..7c3ed402c1 100644
--- a/post/cpu/ppc4xx/uart.c
+++ b/post/cpu/ppc4xx/uart.c
@@ -137,7 +137,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-<<<<<<< master
+#if defined(CONFIG_440)
 #if !defined(CFG_EXT_SERIAL_CLOCK)
 static void serial_divs (int baudrate, unsigned long *pudiv,
 			 unsigned short *pbdiv)
@@ -181,9 +181,6 @@ static void serial_divs (int baudrate, unsigned long *pudiv,
 }
 #endif
 
-=======
-#if defined(CONFIG_440)
->>>>>>> zeus
 static int uart_post_init (unsigned long dev_base)
 {
 	unsigned long reg;