diff --git a/[refs] b/[refs]
index 4fe23e13ef63..fc15a4acaecd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7893afc035590383a14b176c1497cba984276ef4
+refs/heads/master: 748eee0986f0d51c7bc39f194d515a8d8248ebdd
diff --git a/trunk/include/linux/usb/otg.h b/trunk/include/linux/usb/otg.h
index 545cba73ccaf..0a5b3711e502 100644
--- a/trunk/include/linux/usb/otg.h
+++ b/trunk/include/linux/usb/otg.h
@@ -164,8 +164,19 @@ otg_shutdown(struct otg_transceiver *otg)
 }
 
 /* for usb host and peripheral controller drivers */
+#ifdef CONFIG_USB_OTG_UTILS
 extern struct otg_transceiver *otg_get_transceiver(void);
 extern void otg_put_transceiver(struct otg_transceiver *);
+#else
+static inline struct otg_transceiver *otg_get_transceiver(void)
+{
+	return NULL;
+}
+
+static inline void otg_put_transceiver(struct otg_transceiver *x)
+{
+}
+#endif
 
 /* Context: can sleep */
 static inline int