diff options
| author | Tom Rini <trini@ti.com> | 2013-10-21 08:10:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-21 08:10:36 -0400 |
| commit | 748bde608a8dfea5b64e186af4d9c27642fe7813 (patch) | |
| tree | 8564b610e812404bd320ddea458fc585d9c49d7e /arch/powerpc/cpu | |
| parent | 9dff87a297dabe4af60012ad2d990ff8967f1d55 (diff) | |
| parent | 449697f14ebc9f7cb5bf15bbad0d46c6ca2c4979 (diff) | |
| download | u-boot-imx-748bde608a8dfea5b64e186af4d9c27642fe7813.zip u-boot-imx-748bde608a8dfea5b64e186af4d9c27642fe7813.tar.gz u-boot-imx-748bde608a8dfea5b64e186af4d9c27642fe7813.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'arch/powerpc/cpu')
| -rw-r--r-- | arch/powerpc/cpu/mpc5xxx/usb_ohci.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/usb_ohci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c index 3d345ff..a68f9d6 100644 --- a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c +++ b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c @@ -1544,7 +1544,7 @@ static void hc_release_ohci (ohci_t *ohci) */ static char ohci_inited = 0; -int usb_lowlevel_init(int index, void **controller) +int usb_lowlevel_init(int index, enum usb_init_type init, void **controller) { /* Set the USB Clock */ diff --git a/arch/powerpc/cpu/ppc4xx/usb_ohci.c b/arch/powerpc/cpu/ppc4xx/usb_ohci.c index b371a75..fafc15e 100644 --- a/arch/powerpc/cpu/ppc4xx/usb_ohci.c +++ b/arch/powerpc/cpu/ppc4xx/usb_ohci.c @@ -1549,7 +1549,7 @@ static void hc_release_ohci (ohci_t *ohci) */ static char ohci_inited = 0; -int usb_lowlevel_init(int index, void **controller) +int usb_lowlevel_init(int index, enum usb_init_type init, void **controller) { memset (&gohci, 0, sizeof (ohci_t)); memset (&urb_priv, 0, sizeof (urb_priv_t)); |