summaryrefslogtreecommitdiff
path: root/post/cpu
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-14 15:12:01 +0200
committerStefan Roese <sr@denx.de>2007-08-14 15:12:01 +0200
commit4ce846ec59f36b85d6644a769690ad3feb667575 (patch)
tree6dfedf3eeebbab0eefde4d5d17e5fffec10c9536 /post/cpu
parent429d9571f60631ae8a2fe12b11be4c75b0c2b37c (diff)
downloadu-boot-imx-4ce846ec59f36b85d6644a769690ad3feb667575.zip
u-boot-imx-4ce846ec59f36b85d6644a769690ad3feb667575.tar.gz
u-boot-imx-4ce846ec59f36b85d6644a769690ad3feb667575.tar.bz2
POST: Fix merge problem
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'post/cpu')
-rw-r--r--post/cpu/ppc4xx/uart.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/post/cpu/ppc4xx/uart.c b/post/cpu/ppc4xx/uart.c
index 5f14967..7c3ed40 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;