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 git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
drivers
/
usb
/
musb-new
/
musb_uboot.c
diff --git
a/drivers/usb/musb-new/musb_uboot.c
b/drivers/usb/musb-new/musb_uboot.c
index 6ce528c81ee02ed493579f91525f3f80ccf9dd7c..8662c0ff70782bb872db836516e3e12a4c6df3a7 100644
(file)
--- a/
drivers/usb/musb-new/musb_uboot.c
+++ b/
drivers/usb/musb-new/musb_uboot.c
@@
-4,7
+4,7
@@
#ifdef CONFIG_ARCH_SUNXI
#include <asm/arch/usb_phy.h>
#endif
#ifdef CONFIG_ARCH_SUNXI
#include <asm/arch/usb_phy.h>
#endif
-#include <
asm
/errno.h>
+#include <
linux
/errno.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
@@
-446,7
+446,7
@@
int musb_register(struct musb_hdrc_platform_data *plat, void *bdata,
}
*musbp = musb_init_controller(plat, (struct device *)bdata, ctl_regs);
}
*musbp = musb_init_controller(plat, (struct device *)bdata, ctl_regs);
- if (!musbp) {
+ if (!
*
musbp) {
printf("Failed to init the controller\n");
return -EIO;
}
printf("Failed to init the controller\n");
return -EIO;
}