Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325997
b: refs/heads/master
c: d8c3ef2
h: refs/heads/master
i:
  325995: d270f4d
v: v3
  • Loading branch information
Ajay Kumar Gupta authored and Felipe Balbi committed Sep 11, 2012
1 parent ef4440b commit 7015a7a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 65145677a65c31a8fd2704e244801bdb11061f9a
refs/heads/master: d8c3ef256f88b7c6ecd673d03073b5645be9c5e4
3 changes: 1 addition & 2 deletions trunk/drivers/usb/musb/musb_dsps.c
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,7 @@ static int dsps_musb_init(struct musb *musb)
/* mentor core register starts at offset of 0x400 from musb base */
musb->mregs += wrp->musb_core_offset;

/* NOP driver needs change if supporting dual instance */
usb_nop_xceiv_register();
/* Get the NOP PHY */
musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
if (IS_ERR_OR_NULL(musb->xceiv))
return -ENODEV;
Expand Down

0 comments on commit 7015a7a

Please sign in to comment.