Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / drivers / usb / host / ehci-ixp4xx.c

diff --git a/drivers/usb/host/ehci-ixp4xx.c b/drivers/usb/host/ehci-ixp4xx.c
index 56ef7e6c138691c58b05dec33af28a6affc29c06..646e815e71d1ba841346f6f5d1c0a6b6b0c626cd 100644 (file)
--- a/drivers/usb/host/ehci-ixp4xx.c
+++ b/drivers/usb/host/ehci-ixp4xx.c
@@ -14,7 +14,8 @@
  * Create the appropriate control structures to manage
  * a new EHCI host controller.
  */
-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)
 {
        *hccr = (struct ehci_hccr *)(0xcd000100);
        *hcor = (struct ehci_hcor *)((uint32_t) *hccr