Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[net-next-2.6.git] / include / linux / usb / otg.h

diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index 6c0b676b27d83e5ca352aa0fb46ca7884eabbc6a..f8302d036a7674e33109bf8fce16d67325d2d17a 100644 (file)
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -123,9 +123,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)