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
/
serial_max3100.c
diff --git
a/drivers/serial/serial_max3100.c
b/drivers/serial/serial_max3100.c
index
0611fc1
..
4abc271
100644
(file)
--- a/
drivers/serial/serial_max3100.c
+++ b/
drivers/serial/serial_max3100.c
@@
-26,8
+26,6
@@
#include <common.h>
#include <watchdog.h>
-#ifdef CONFIG_MAX3100_SERIAL
-
DECLARE_GLOBAL_DATA_PTR;
/**************************************************************/
@@
-298,5
+296,3
@@
int serial_tstc(void)
void serial_setbrg(void)
{
}
-
-#endif