POST: Fix merge problem

Signed-off-by: Stefan Roese <sr@denx.de>
18 years ago · 4ce846ec59
parent 429d9571f6
commit 4ce846ec59
1 changed files with 1 additions and 4 deletions
--- 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;