projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix merge problems
[platform/kernel/u-boot.git]
/
drivers
/
serial
/
s3c4510b_uart.c
diff --git
a/drivers/serial/s3c4510b_uart.c
b/drivers/serial/s3c4510b_uart.c
index
ddcd591
..
aa378e1
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