---

yaml --- r: 361636 b: refs/heads/master c: 7fa4cd1 h: refs/heads/master v: v3
git-mirror · Mar 20, 2013 · 34f8697 · 34f8697
1 parent e31491b
commit 34f8697
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3416905ba058e43112ad7b1b4859797f027f5a07
+refs/heads/master: 7fa4cd1a78ea5af688ffce45553abbee9d7afd84
diff --git a/trunk/include/linux/usb/ulpi.h b/trunk/include/linux/usb/ulpi.h
@@ -181,8 +181,16 @@
 
 /*-------------------------------------------------------------------------*/
 
+#if IS_ENABLED(CONFIG_USB_ULPI)
 struct usb_phy *otg_ulpi_create(struct usb_phy_io_ops *ops,
 					unsigned int flags);
+#else
+static inline struct usb_phy *otg_ulpi_create(struct usb_phy_io_ops *ops,
+					      unsigned int flags)
+{
+	return NULL;
+}
+#endif
 
 #ifdef CONFIG_USB_ULPI_VIEWPORT
 /* access ops for controllers with a viewport register */