---

yaml --- r: 226963 b: refs/heads/master c: 352a337 h: refs/heads/master i: 226961: 808b1b7 226959: 16de3f8 v: v3
git-mirror · Dec 10, 2010 · 6af047b · 6af047b
1 parent bdc597b
commit 6af047b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);