]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
USB: musb_hdrc: another davinci buildfix (otg related)
authorDavid Brownell <dbrownell@users.sourceforge.net>
Sun, 25 Jan 2009 01:56:25 +0000 (17:56 -0800)
committerGreg Kroah-Hartman <gregkh@kvm.kroah.org>
Wed, 28 Jan 2009 00:15:32 +0000 (16:15 -0800)
The DaVinci code had an implementation of the OTG transceiver glue
too; make it use the new-standard one.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/arm/mach-davinci/usb.c
drivers/usb/musb/Kconfig

index c6fb32c36c52f137579349aad153e3969b2470ee..867ead2559adf9e6b0f41f12e8af6c40b2083cc1 100644 (file)
@@ -77,29 +77,6 @@ static struct platform_device usb_dev = {
        .num_resources  = ARRAY_SIZE(usb_resources),
 };
 
-#ifdef CONFIG_USB_MUSB_OTG
-
-static struct otg_transceiver *xceiv;
-
-struct otg_transceiver *otg_get_transceiver(void)
-{
-       if (xceiv)
-               get_device(xceiv->dev);
-       return xceiv;
-}
-EXPORT_SYMBOL(otg_get_transceiver);
-
-int otg_set_transceiver(struct otg_transceiver *x)
-{
-       if (xceiv && x)
-               return -EBUSY;
-       xceiv = x;
-       return 0;
-}
-EXPORT_SYMBOL(otg_set_transceiver);
-
-#endif
-
 void __init setup_usb(unsigned mA, unsigned potpgt_msec)
 {
        usb_data.power = mA / 2;
index 5af7379cd9a3a73157b0d4214c796c521fdd20ca..e1d81d8de2257092aef9b4157e5048abec539ce2 100644 (file)
@@ -11,6 +11,7 @@ config USB_MUSB_HDRC
        depends on (USB || USB_GADGET) && HAVE_CLK
        depends on !SUPERH
        select TWL4030_USB if MACH_OMAP_3430SDP
+       select USB_OTG_UTILS
        tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
        help
          Say Y here if your system has a dual role high speed USB