Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 232639
b: refs/heads/master
c: 3bb8029
h: refs/heads/master
i:
  232637: 467c8eb
  232635: 98277f6
  232631: 4c7ef1c
  232623: 0a7872d
  232607: c542872
  232575: e24fe51
v: v3
  • Loading branch information
Eric Bénard authored and Greg Kroah-Hartman committed Jan 23, 2011
1 parent b4c598b commit 48c56eb
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 96a3e79edff6f41b0f115a82f1a39d66218077a7
refs/heads/master: 3bb8029a2445e289efade6133b01545143336f70
4 changes: 2 additions & 2 deletions trunk/drivers/usb/host/ehci-mxc.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
clk_enable(priv->ahbclk);
}

/* "dr" device has its own clock */
if (pdev->id == 0) {
/* "dr" device has its own clock on i.MX51 */
if (cpu_is_mx51() && (pdev->id == 0)) {
priv->phy1clk = clk_get(dev, "usb_phy1");
if (IS_ERR(priv->phy1clk)) {
ret = PTR_ERR(priv->phy1clk);
Expand Down

0 comments on commit 48c56eb

Please sign in to comment.