diff --git a/[refs] b/[refs]
index 835bdc8e8267..7ccfba07d8ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ebc86eda7ebb36ee66a90a7a5bbfc948f181088
+refs/heads/master: 224e1542b6ca2d38dc0c7ea65fb6760c082b1309
diff --git a/trunk/include/linux/usb/otg.h b/trunk/include/linux/usb/otg.h
index 52bb917641f0..fef0972c8146 100644
--- a/trunk/include/linux/usb/otg.h
+++ b/trunk/include/linux/usb/otg.h
@@ -110,9 +110,19 @@ struct otg_transceiver {
 /* for board-specific init logic */
 extern int otg_set_transceiver(struct otg_transceiver *);
 
+#if defined(CONFIG_NOP_USB_XCEIV) || defined(CONFIG_NOP_USB_XCEIV_MODULE)
 /* sometimes transceivers are accessed only through e.g. ULPI */
 extern void usb_nop_xceiv_register(void);
 extern void usb_nop_xceiv_unregister(void);
+#else
+static inline void usb_nop_xceiv_register(void)
+{
+}
+
+static inline void usb_nop_xceiv_unregister(void)
+{
+}
+#endif
 
 /* helpers for direct access thru low-level io interface */
 static inline int otg_io_read(struct otg_transceiver *otg, u32 reg)