diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2009-01-24 20:56:25 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@kvm.kroah.org> | 2009-01-27 19:15:32 -0500 |
commit | 37daa925cf0d4dfd2d1d9ca01e2e0d74fba3d64a (patch) | |
tree | 6760325baee1551d3f69f9a5eaf8b56ccabe5ce9 /arch/arm/mach-davinci/usb.c | |
parent | 10b4eadef140b09baf8b9ec1df37185e69773275 (diff) |
USB: musb_hdrc: another davinci buildfix (otg related)
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>
Diffstat (limited to 'arch/arm/mach-davinci/usb.c')
-rw-r--r-- | arch/arm/mach-davinci/usb.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index c6fb32c36c52..867ead2559ad 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c | |||
@@ -77,29 +77,6 @@ static struct platform_device usb_dev = { | |||
77 | .num_resources = ARRAY_SIZE(usb_resources), | 77 | .num_resources = ARRAY_SIZE(usb_resources), |
78 | }; | 78 | }; |
79 | 79 | ||
80 | #ifdef CONFIG_USB_MUSB_OTG | ||
81 | |||
82 | static struct otg_transceiver *xceiv; | ||
83 | |||
84 | struct otg_transceiver *otg_get_transceiver(void) | ||
85 | { | ||
86 | if (xceiv) | ||
87 | get_device(xceiv->dev); | ||
88 | return xceiv; | ||
89 | } | ||
90 | EXPORT_SYMBOL(otg_get_transceiver); | ||
91 | |||
92 | int otg_set_transceiver(struct otg_transceiver *x) | ||
93 | { | ||
94 | if (xceiv && x) | ||
95 | return -EBUSY; | ||
96 | xceiv = x; | ||
97 | return 0; | ||
98 | } | ||
99 | EXPORT_SYMBOL(otg_set_transceiver); | ||
100 | |||
101 | #endif | ||
102 | |||
103 | void __init setup_usb(unsigned mA, unsigned potpgt_msec) | 80 | void __init setup_usb(unsigned mA, unsigned potpgt_msec) |
104 | { | 81 | { |
105 | usb_data.power = mA / 2; | 82 | usb_data.power = mA / 2; |