diff options
author | Linus Torvalds | 2009-11-18 16:37:51 +0100 |
---|---|---|
committer | Linus Torvalds | 2009-11-18 16:37:51 +0100 |
commit | 2d5bc23b32e0ec6fe9c1cdd9f371063881dc1ffc (patch) | |
tree | 3203cf45058a8ce7ebc3c712fd872e0c85fd5ccc /drivers/usb/host/ohci-hcd.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (diff) | |
parent | USB: option.c: add support for D-Link DWM-162-U5 (diff) | |
download | kernel-qcow2-linux-2d5bc23b32e0ec6fe9c1cdd9f371063881dc1ffc.tar.gz kernel-qcow2-linux-2d5bc23b32e0ec6fe9c1cdd9f371063881dc1ffc.tar.xz kernel-qcow2-linux-2d5bc23b32e0ec6fe9c1cdd9f371063881dc1ffc.zip |
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:
USB: option.c: add support for D-Link DWM-162-U5
USB: usbmon: fix bug in mon_buff_area_shrink
USB: xhci: Fix scratchpad deallocation.
USB: xhci: Fix TRB physical to virtual address translation.
USB: xhci: Fix bug memory free after failed initialization.
USB: cdc_acm: Fix memory leak after hangup
USB: cdc_acm: Fix race condition when opening tty
USB: ohci: quirk AMD prefetch for USB 1.1 ISO transfer
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 78bb7710f36d..24eb74781919 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -87,6 +87,7 @@ static int ohci_restart (struct ohci_hcd *ohci); #ifdef CONFIG_PCI static void quirk_amd_pll(int state); static void amd_iso_dev_put(void); +static void sb800_prefetch(struct ohci_hcd *ohci, int on); #else static inline void quirk_amd_pll(int state) { @@ -96,6 +97,10 @@ static inline void amd_iso_dev_put(void) { return; } +static inline void sb800_prefetch(struct ohci_hcd *ohci, int on) +{ + return; +} #endif |