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-mips
[oweals/u-boot.git]
/
drivers
/
usb
/
host
/
ehci-armada100.c
diff --git
a/drivers/usb/host/ehci-armada100.c
b/drivers/usb/host/ehci-armada100.c
index 636b6e5da026794843104c85e614a2e9d595300e..012eb3a1a44d8c353a0877e811c7a360f8fcffcc 100644
(file)
--- a/
drivers/usb/host/ehci-armada100.c
+++ b/
drivers/usb/host/ehci-armada100.c
@@
-22,7
+22,8
@@
/*
* EHCI host controller init
*/
/*
* EHCI host controller init
*/
-int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
+int ehci_hcd_init(int index, enum usb_init_type init,
+ struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{
if (utmi_init() < 0)
return -1;
{
if (utmi_init() < 0)
return -1;