aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-27 19:08:04 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-27 19:08:04 -0500
commite4a7ca29039e615ce13a61b9c6abfb2aa394e9a1 (patch)
treefc7f36ccb9ec01e95636c01b09589e88da5c520f /arch/arm
parent843c04a0f63c74c6424e4b7d1ab85223b1ecf740 (diff)
parent236dd4d18f293e3c9798f35c08272196826a980d (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (36 commits) USB: Driver for Freescale QUICC Engine USB Host Controller USB: option: add QUANTA HSDPA Data Card device ids USB: storage: Add another unusual_dev for off-by-one bug USB: unusual_dev: usb-storage needs to ignore a device USB: GADGET: fix !x & y USB: new id for ti_usb_3410_5052 driver USB: cdc-acm: Add another conexant modem to the quirks USB: 'option' driver - onda device MT503HS has wrong id USB: Remove ZTE modem from unusual_devices USB: storage: support of Dane-Elec MediaTouch USB device USB: usbmon: Implement compat_ioctl USB: add kernel-doc for wusb_dev in struct usb_device USB: ftdi_sio driver support of bar code scanner from Diebold USB: ftdi_sio: added Alti-2 VID and Neptune 3 PID USB: cp2101 device USB: usblp.c: add USBLP_QUIRK_BIDIR to Brother HL-1440 USB: remove vernier labpro from ldusb USB: CDC-ACM quirk for MTK GPS USB: cdc-acm: support some gps data loggers USB: composite: Fix bug: low byte of w_index is the usb interface number not the whole 2 bytes of w_index ...
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-davinci/usb.c23
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
82static struct otg_transceiver *xceiv;
83
84struct otg_transceiver *otg_get_transceiver(void)
85{
86 if (xceiv)
87 get_device(xceiv->dev);
88 return xceiv;
89}
90EXPORT_SYMBOL(otg_get_transceiver);
91
92int otg_set_transceiver(struct otg_transceiver *x)
93{
94 if (xceiv && x)
95 return -EBUSY;
96 xceiv = x;
97 return 0;
98}
99EXPORT_SYMBOL(otg_set_transceiver);
100
101#endif
102
103void __init setup_usb(unsigned mA, unsigned potpgt_msec) 80void __init setup_usb(unsigned mA, unsigned potpgt_msec)
104{ 81{
105 usb_data.power = mA / 2; 82 usb_data.power = mA / 2;