diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 22:59:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 22:59:32 -0700 |
| commit | c972398b7871d9fb58c6a317786065a7cc6ca4be (patch) | |
| tree | d83d783326f2c7204d8e1ff7812319e2be91be0c /drivers | |
| parent | 2ff712585a5026a021859233fce145068292584d (diff) | |
| parent | 6e3ce3ae8e872f2d3a30f5ce5bc3b7c5eeca4343 (diff) | |
| download | linux-stable-c972398b7871d9fb58c6a317786065a7cc6ca4be.tar.gz linux-stable-c972398b7871d9fb58c6a317786065a7cc6ca4be.tar.bz2 linux-stable-c972398b7871d9fb58c6a317786065a7cc6ca4be.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/ohci-hub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c index f36cbd02736d..ec75774abeac 100644 --- a/drivers/usb/host/ohci-hub.c +++ b/drivers/usb/host/ohci-hub.c @@ -132,6 +132,8 @@ static inline struct ed *find_head (struct ed *ed) return ed; } +static int ohci_restart (struct ohci_hcd *ohci); + /* caller has locked the root hub */ static int ohci_rh_resume (struct ohci_hcd *ohci) __releases(ohci->lock) @@ -181,8 +183,6 @@ __acquires(ohci->lock) #ifdef CONFIG_PM if (status == -EBUSY) { if (!autostopped) { - static int ohci_restart (struct ohci_hcd *ohci); - spin_unlock_irq (&ohci->lock); (void) ohci_init (ohci); status = ohci_restart (ohci); |