From 34f869797f37db91e4ee97eca77c795473947a0c Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Wed, 20 Mar 2013 10:35:44 -0300
Subject: [PATCH] --- yaml --- r: 361636 b: refs/heads/master c:
 7fa4cd1a78ea5af688ffce45553abbee9d7afd84 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/usb/ulpi.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e40d131ba34a..88ea3cc7d8f4 100644
--- 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
index 6f033a415ecb..5c295c26ad37 100644
--- 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 */