git.maquefel.me Git - linux.git/commit

author	Anatolij Gustschin <agust@denx.de>
	Thu, 5 May 2011 10:11:21 +0000 (12:11 +0200)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Sat, 7 May 2011 01:16:39 +0000 (18:16 -0700)
commit	3df004532582d0cc721da0df28311bcedd639724
tree	d9ee3de5a34e5a1dcfc4a67043336ddd7cbe1664	tree \| snapshot
parent	9be0392989306361d4a63a06a8ee281efbead548	commit \| diff

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>

12 files changed:

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/usb/musb/am35x.c		diff \| blob \| history
drivers/usb/musb/blackfin.c		diff \| blob \| history
drivers/usb/musb/da8xx.c		diff \| blob \| history
drivers/usb/musb/davinci.c		diff \| blob \| history
drivers/usb/musb/musb_core.c		diff \| blob \| history
drivers/usb/musb/musb_debug.h		diff \| blob \| history
drivers/usb/musb/musb_gadget.c		diff \| blob \| history
drivers/usb/musb/musb_host.c		diff \| blob \| history
drivers/usb/musb/musb_virthub.c		diff \| blob \| history
drivers/usb/musb/omap2430.c		diff \| blob \| history
drivers/usb/musb/tusb6010.c		diff \| blob \| history
include/linux/usb/otg.h		diff \| blob \| history