projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-ubi
[oweals/u-boot.git]
/
drivers
/
serial
/
usbtty.h
diff --git
a/drivers/serial/usbtty.h
b/drivers/serial/usbtty.h
index e243a8e3b203fe2106beae5b7b3b957629acfacb..538b6d715d42662c88a8726705f655889d819358 100644
(file)
--- a/
drivers/serial/usbtty.h
+++ b/
drivers/serial/usbtty.h
@@
-14,18
+14,15
@@
#include <usbdevice.h>
#if defined(CONFIG_PPC)
#include <usb/mpc8xx_udc.h>
#include <usbdevice.h>
#if defined(CONFIG_PPC)
#include <usb/mpc8xx_udc.h>
-#elif defined(CONFIG_OMAP1510)
-#include <usb/omap1510_udc.h>
-#elif defined(CONFIG_MUSB_UDC)
-#include <usb/musb_udc.h>
#elif defined(CONFIG_CPU_PXA27X)
#include <usb/pxa27x_udc.h>
#elif defined(CONFIG_DW_UDC)
#include <usb/designware_udc.h>
#elif defined(CONFIG_CPU_PXA27X)
#include <usb/pxa27x_udc.h>
#elif defined(CONFIG_DW_UDC)
#include <usb/designware_udc.h>
-#elif defined(CONFIG_
MV
_UDC)
-#include <usb/
mv
_udc.h>
+#elif defined(CONFIG_
CI
_UDC)
+#include <usb/
ci
_udc.h>
#endif
#endif
+#include <usb/udc.h>
#include <version.h>
/* If no VendorID/ProductID is defined in config.h, pretend to be Linux
#include <version.h>
/* If no VendorID/ProductID is defined in config.h, pretend to be Linux