]> git.sur5r.net Git - u-boot/commitdiff
POST: Fix merge problem
authorStefan Roese <sr@denx.de>
Tue, 14 Aug 2007 13:12:01 +0000 (15:12 +0200)
committerStefan Roese <sr@denx.de>
Tue, 14 Aug 2007 13:12:01 +0000 (15:12 +0200)
Signed-off-by: Stefan Roese <sr@denx.de>
post/cpu/ppc4xx/uart.c

index 5f14967fee945e5b665412d5b9f0c0e13af62d81..7c3ed402c194bd86f810489640ce059adc847c49 100644 (file)
 
 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;