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-mmc
[oweals/u-boot.git]
/
drivers
/
usb
/
musb
/
musb_hcd.h
diff --git
a/drivers/usb/musb/musb_hcd.h
b/drivers/usb/musb/musb_hcd.h
index 0c8e75d46c1e0b1a493eefe2807ac9173b874dcc..831957d9f9fc034ef8f677574fcd26998b59e36c 100644
(file)
--- a/
drivers/usb/musb/musb_hcd.h
+++ b/
drivers/usb/musb/musb_hcd.h
@@
-17,8
+17,8
@@
extern unsigned char new[];
#endif
-#ifndef CONFIG_MUSB_TIMEOUT
-# define CONFIG_MUSB_TIMEOUT 100000
+#ifndef CONFIG_
USB_
MUSB_TIMEOUT
+# define CONFIG_
USB_
MUSB_TIMEOUT 100000
#endif
/* This defines the endpoint number used for control transfers */