summaryrefslogtreecommitdiff
path: root/drivers/serial/serial_max3100.c
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2008-08-04 17:18:14 (GMT)
committerMarkus Klotzbuecher <mk@denx.de>2008-08-04 17:18:14 (GMT)
commit0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch)
treefc05bf5db93e5a9c1712d24a5efdff94685063c2 /drivers/serial/serial_max3100.c
parentab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff)
parent81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff)
downloadu-boot-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.xz
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'drivers/serial/serial_max3100.c')
-rw-r--r--drivers/serial/serial_max3100.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/serial/serial_max3100.c b/drivers/serial/serial_max3100.c
index 0611fc1..4abc271 100644
--- 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