---

yaml --- r: 364700 b: refs/heads/master c: fcd12b9 h: refs/heads/master v: v3
git-mirror · Mar 18, 2013 · d14ecb8 · d14ecb8
1 parent 08de293
commit d14ecb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d3dbfc3a74f70750c8385dff36d4d46b6bd3a1a
+refs/heads/master: fcd12b9711816e7cb0a3eb1b47790979e4c14c58
diff --git a/trunk/drivers/usb/host/ehci-mv.c b/trunk/drivers/usb/host/ehci-mv.c
@@ -240,7 +240,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
 
 	ehci_mv->mode = pdata->mode;
 	if (ehci_mv->mode == MV_USB_MODE_OTG) {
-#ifdef CONFIG_USB_OTG_UTILS
+#if IS_ENABLED(CONFIG_USB_PHY)
 		ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
 		if (IS_ERR_OR_NULL(ehci_mv->otg)) {
 			dev_err(&pdev->dev,
@@ -260,7 +260,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
 		mv_ehci_disable(ehci_mv);
 #else
 		dev_info(&pdev->dev, "MV_USB_MODE_OTG "
-			 "must have CONFIG_USB_OTG_UTILS enabled\n");
+			 "must have CONFIG_USB_PHY enabled\n");
 		goto err_disable_clk;
 #endif
 	} else {