diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 21:29:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 21:29:23 -0400 |
| commit | 88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3 (patch) | |
| tree | f79f728c308100bc3e57d0d2f5d1e00d90406a0d /drivers/usb/host/uhci-pci.c | |
| parent | e18945b159a1cdbc031f1d3b0b7e515a33bdcbf7 (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
Merge 3.12-rc3 into driver-core-next
We want the driver core and sysfs fixes in here to make merges and
development easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/uhci-pci.c')
| -rw-r--r-- | drivers/usb/host/uhci-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c index c300bd2f7d1c..0f228c46eeda 100644 --- a/drivers/usb/host/uhci-pci.c +++ b/drivers/usb/host/uhci-pci.c | |||
| @@ -293,7 +293,7 @@ static struct pci_driver uhci_pci_driver = { | |||
| 293 | .remove = usb_hcd_pci_remove, | 293 | .remove = usb_hcd_pci_remove, |
| 294 | .shutdown = uhci_shutdown, | 294 | .shutdown = uhci_shutdown, |
| 295 | 295 | ||
| 296 | #ifdef CONFIG_PM_SLEEP | 296 | #ifdef CONFIG_PM |
| 297 | .driver = { | 297 | .driver = { |
| 298 | .pm = &usb_hcd_pci_pm_ops | 298 | .pm = &usb_hcd_pci_pm_ops |
| 299 | }, | 299 | }, |