summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/uhci-pci.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-29 18:45:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-29 18:45:55 -0700
commitdf9b17f5868bdafd46cad18b08f1e70fa22b8854 (patch)
tree5667fbd3a0b915463f9558e3d40de309b7a7c0de /drivers/usb/host/uhci-pci.c
parentf1ddc24c9e33813f74b871d73e4d795dcdb95a3c (diff)
parent15c03dd4859ab16f9212238f29dd315654aa94f6 (diff)
downloadblackbird-op-linux-df9b17f5868bdafd46cad18b08f1e70fa22b8854.tar.gz
blackbird-op-linux-df9b17f5868bdafd46cad18b08f1e70fa22b8854.zip
Merge 3.12-rc3 into usb-next
We want the USB fixes in here as well. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c
index f7bbf43be039..d89c78dc70c0 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 = {
.remove = usb_hcd_pci_remove,
.shutdown = uhci_shutdown,
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
.driver = {
.pm = &usb_hcd_pci_pm_ops
},
OpenPOWER on IntegriCloud