diff options
author | Len Brown <len.brown@intel.com> | 2005-07-12 23:21:56 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-07-12 23:21:56 +0200 |
commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
tree | 74800e35129775413c13ce7caf036ca19e3ce56c /drivers/usb | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
parent | [ACPI] increase MAX_IO_APICS to 64 on i386 (diff) | |
download | linux-5028770a42e7bc4d15791a44c28f0ad539323807.tar.xz linux-5028770a42e7bc4d15791a44c28f0ad539323807.zip |
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/hcd-pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 71b4a8d66318..fc056062c960 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c @@ -380,6 +380,7 @@ int usb_hcd_pci_resume (struct pci_dev *dev) usb_hc_died (hcd); } + pci_enable_device(dev); return retval; } EXPORT_SYMBOL (usb_hcd_pci_resume); |