hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: fix build error in ohci driver
This commit is contained in:
Linus Torvalds 2006-09-28 22:59:32 -07:00
parent 2ff712585a 6e3ce3ae8e
commit c972398b78
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/host/ohci-hub.c
View File

@ -132,6 +132,8 @@ static inline struct ed *find_head (struct ed *ed)
return ed; return ed;
} }
static int ohci_restart (struct ohci_hcd *ohci);
/* caller has locked the root hub */ /* caller has locked the root hub */
static int ohci_rh_resume (struct ohci_hcd *ohci) static int ohci_rh_resume (struct ohci_hcd *ohci)
__releases(ohci->lock) __releases(ohci->lock)
@ -181,8 +183,6 @@ __acquires(ohci->lock)
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (status == -EBUSY) { if (status == -EBUSY) {
if (!autostopped) { if (!autostopped) {
static int ohci_restart (struct ohci_hcd *ohci);
spin_unlock_irq (&ohci->lock); spin_unlock_irq (&ohci->lock);
(void) ohci_init (ohci); (void) ohci_init (ohci);
status = ohci_restart (ohci); status = ohci_restart (ohci);