summaryrefslogtreecommitdiff
path: root/include/linux/usb/otg.h
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2011-05-05 14:11:21 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-07 05:16:39 +0400
commit3df004532582d0cc721da0df28311bcedd639724 (patch)
treed9ee3de5a34e5a1dcfc4a67043336ddd7cbe1664 /include/linux/usb/otg.h
parent9be0392989306361d4a63a06a8ee281efbead548 (diff)
downloadlinux-3df004532582d0cc721da0df28311bcedd639724.tar.xz
usb: fix building musb drivers
Commit 3dacdf11 "usb: factor out state_string() on otg drivers" broke building musb drivers since there is already another otg_state_string() function in musb drivers, but with different prototype. Fix musb drivers to use common otg_state_string(), too. Also provide a nop for otg_state_string() if CONFIG_USB_OTG_UTILS is not defined. Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb/otg.h')
-rw-r--r--include/linux/usb/otg.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index bc84858b3a4d..d87f44f5b04e 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -168,6 +168,7 @@ otg_shutdown(struct otg_transceiver *otg)
#ifdef CONFIG_USB_OTG_UTILS
extern struct otg_transceiver *otg_get_transceiver(void);
extern void otg_put_transceiver(struct otg_transceiver *);
+extern const char *otg_state_string(enum usb_otg_state state);
#else
static inline struct otg_transceiver *otg_get_transceiver(void)
{
@@ -177,6 +178,11 @@ static inline struct otg_transceiver *otg_get_transceiver(void)
static inline void otg_put_transceiver(struct otg_transceiver *x)
{
}
+
+static inline const char *otg_state_string(enum usb_otg_state state)
+{
+ return NULL;
+}
#endif
/* Context: can sleep */
@@ -246,6 +252,5 @@ otg_unregister_notifier(struct otg_transceiver *otg, struct notifier_block *nb)
/* for OTG controller drivers (and maybe other stuff) */
extern int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num);
-extern const char *otg_state_string(enum usb_otg_state state);
#endif /* __LINUX_USB_OTG_H */