Merge git://git.denx.de/u-boot-usb

[people/ms/u-boot.git] / drivers / usb / host / xhci-omap.c

diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c
index 3a5520838447d75102e383ffb771e5ab0cab6213..b814500bdbb7642941c192cef87e1dd97f92b17d 100644 (file)
--- a/drivers/usb/host/xhci-omap.c
+++ b/drivers/usb/host/xhci-omap.c
@@ -11,7 +11,7 @@
 
 #include <common.h>
 #include <usb.h>
-#include <asm-generic/errno.h>
+#include <linux/errno.h>
 #include <asm/omap_common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sys_proto.h>
@@ -27,13 +27,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static struct omap_xhci omap;
 
-inline int __board_usb_init(int index, enum usb_init_type init)
-{
-       return 0;
-}
-int board_usb_init(int index, enum usb_init_type init)
-       __attribute__((weak, alias("__board_usb_init")));
-
 static int omap_xhci_core_init(struct omap_xhci *omap)
 {
        int ret = 0;
@@ -96,4 +89,5 @@ void xhci_hcd_stop(int index)
        struct omap_xhci *ctx = &omap;
 
        omap_xhci_core_exit(ctx);
+       board_usb_cleanup(index, USB_INIT_HOST);
 }