summaryrefslogtreecommitdiff
path: root/drivers/serial/usbtty.c
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2008-08-04 19:18:14 +0200
committerMarkus Klotzbuecher <mk@denx.de>2008-08-04 19:18:14 +0200
commit0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch)
treefc05bf5db93e5a9c1712d24a5efdff94685063c2 /drivers/serial/usbtty.c
parentab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff)
parent81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff)
downloadu-boot-imx-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.zip
u-boot-imx-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.gz
u-boot-imx-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'drivers/serial/usbtty.c')
-rw-r--r--drivers/serial/usbtty.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index 2bc5c3c..e738c56 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -23,8 +23,6 @@
#include <common.h>
-#ifdef CONFIG_USB_TTY
-
#include <circbuf.h>
#include <devices.h>
#include "usbtty.h"
@@ -1007,6 +1005,3 @@ void usbtty_poll (void)
udc_irq();
}
-
-
-#endif