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-usb
[oweals/u-boot.git]
/
drivers
/
usb
/
usbdcore_omap1510.c
diff --git
a/drivers/usb/usbdcore_omap1510.c
b/drivers/usb/usbdcore_omap1510.c
index 4e3239f5809a5d0818129b00fe70b753c2d6fde4..cb9dc442e7bf8f3d8efc95cd2b67ca695a984fa1 100644
(file)
--- a/
drivers/usb/usbdcore_omap1510.c
+++ b/
drivers/usb/usbdcore_omap1510.c
@@
-27,9
+27,6
@@
*/
#include <common.h>
-
-#if ((defined(CONFIG_OMAP1510) || defined(CONFIG_OMAP1610)) && defined(CONFIG_USB_DEVICE))
-
#include <asm/io.h>
#ifdef CONFIG_OMAP_SX1
#include <i2c.h>
@@
-1566,4
+1563,3
@@
void udc_unset_nak (int epid)
{
/* TODO: implement this functionality in omap1510 */
}
-#endif