diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
| commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
| tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/host/ohci-mem.c | |
| parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
| parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/host/ohci-mem.c')
| -rw-r--r-- | drivers/usb/host/ohci-mem.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c index 9fb83dfb1eb4..bfbe328a4788 100644 --- a/drivers/usb/host/ohci-mem.c +++ b/drivers/usb/host/ohci-mem.c | |||
| @@ -28,7 +28,6 @@ static void ohci_hcd_init (struct ohci_hcd *ohci) | |||
| 28 | ohci->next_statechange = jiffies; | 28 | ohci->next_statechange = jiffies; |
| 29 | spin_lock_init (&ohci->lock); | 29 | spin_lock_init (&ohci->lock); |
| 30 | INIT_LIST_HEAD (&ohci->pending); | 30 | INIT_LIST_HEAD (&ohci->pending); |
| 31 | INIT_WORK (&ohci->rh_resume, ohci_rh_resume, ohci_to_hcd(ohci)); | ||
| 32 | ohci->reboot_notifier.notifier_call = ohci_reboot; | 31 | ohci->reboot_notifier.notifier_call = ohci_reboot; |
| 33 | } | 32 | } |
| 34 | 33 | ||