Merge with git://www.denx.de/git/u-boot.git

[oweals/u-boot.git] / cpu / arm920t / at91rm9200 / usb.c

diff --git a/cpu/arm920t/at91rm9200/usb.c b/cpu/arm920t/at91rm9200/usb.c
index 7b83f23eb380eb069b30f02774d7cbe7c2a2ecd9..366262e4ccd0c2f5b71f235a4d2fdd50a82f7183 100644 (file)
--- a/cpu/arm920t/at91rm9200/usb.c
+++ b/cpu/arm920t/at91rm9200/usb.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT)
+#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
 # ifdef CONFIG_AT91RM9200
 
 #include <asm/arch/hardware.h>
@@ -43,5 +43,11 @@ int usb_cpu_stop()
        *AT91C_PMC_SCDR = AT91C_PMC_UHP;        /* 48MHz clock disabled for UHP */
        return 0;
 }
+
+int usb_cpu_init_fail()
+{
+       usb_cpu_stop();
+}
+
 # endif /* CONFIG_AT91RM9200 */
 #endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */