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-net
[oweals/u-boot.git]
/
include
/
usb.h
diff --git
a/include/usb.h
b/include/usb.h
index 4e1539fa8820684b7c38e2cf00c283d7b6eeb07d..e68e98eadc70d9eaa7f11479e4c06e599a4ab302 100644
(file)
--- a/
include/usb.h
+++ b/
include/usb.h
@@
-171,7
+171,7
@@
struct usb_device {
#if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \
defined(CONFIG_USB_OHCI_NEW) || defined (CONFIG_USB_SL811HS) || \
#if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \
defined(CONFIG_USB_OHCI_NEW) || defined (CONFIG_USB_SL811HS) || \
- defined(CONFIG_USB_ISP116X_HCD)
+ defined(CONFIG_USB_ISP116X_HCD)
|| defined(CONFIG_USB_R8A66597_HCD)
int usb_lowlevel_init(void);
int usb_lowlevel_stop(void);
int usb_lowlevel_init(void);
int usb_lowlevel_stop(void);
@@
-195,7
+195,7
@@
void usb_event_poll(void);
#define USB_MAX_STOR_DEV 5
block_dev_desc_t *usb_stor_get_dev(int index);
int usb_stor_scan(int mode);
#define USB_MAX_STOR_DEV 5
block_dev_desc_t *usb_stor_get_dev(int index);
int usb_stor_scan(int mode);
-
void
usb_stor_info(void);
+
int
usb_stor_info(void);
#endif
#endif