diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/usb/host/uhci-pci.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
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 | }, |