diff --git a/[refs] b/[refs]
index 0db2877a744c..1c336e96b442 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 537baabbdfebe7f9514f05b62eac91b4bfa0bdf2
+refs/heads/master: 352a337832774a6929c16b569abe9cedc3db01cc
diff --git a/trunk/include/linux/usb/otg.h b/trunk/include/linux/usb/otg.h
index 0a5b3711e502..a1a1e7a73ec9 100644
--- a/trunk/include/linux/usb/otg.h
+++ b/trunk/include/linux/usb/otg.h
@@ -116,7 +116,7 @@ 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)
+#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
 /* sometimes transceivers are accessed only through e.g. ULPI */
 extern void usb_nop_xceiv_register(void);
 extern void usb_nop_xceiv_unregister(void);