Fix merge problems

[karo-tx-uboot.git] / drivers / serial / s3c4510b_uart.c

diff --git a/drivers/serial/s3c4510b_uart.c b/drivers/serial/s3c4510b_uart.c
index ddcd591f84a3b0bd08c12bf890cf89b750d850d5..aa378e1ac1e33c278fbd151bb3702ca00330459b 100644 (file)
--- a/drivers/serial/s3c4510b_uart.c
+++ b/drivers/serial/s3c4510b_uart.c
@@ -45,8 +45,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DRIVER_S3C4510_UART
-
 #include <asm/hardware.h>
 #include "s3c4510b_uart.h"
 
@@ -212,5 +210,3 @@ void serial_puts (const char *s)
        uart->m_ctrl.bf.sendBreak = 0;
 
 }
-
-#endif