summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAl Viro2007-10-13 23:29:47 +0200
committerLinus Torvalds2007-10-14 03:18:30 +0200
commit4735b37cf434175c2b7b36b3b68f1e60e8ec8527 (patch)
tree302ae547b18fe3730af99612b13f902e73f757be /drivers/usb
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff)
downloadkernel-qcow2-linux-4735b37cf434175c2b7b36b3b68f1e60e8ec8527.tar.gz
kernel-qcow2-linux-4735b37cf434175c2b7b36b3b68f1e60e8ec8527.tar.xz
kernel-qcow2-linux-4735b37cf434175c2b7b36b3b68f1e60e8ec8527.zip
Fix ohci-ssb with !CONFIG_PM
ohci_bus_{suspend,resume} exists only if we have CONFIG_PM; do the same thing as other subdrivers... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ohci-ssb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
index bc3e785d8c00..fe70e72340de 100644
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -117,8 +117,10 @@ static const struct hc_driver ssb_ohci_hc_driver = {
.hub_status_data = ohci_hub_status_data,
.hub_control = ohci_hub_control,
.hub_irq_enable = ohci_rhsc_enable,
+#ifdef CONFIG_PM
.bus_suspend = ohci_bus_suspend,
.bus_resume = ohci_bus_resume,
+#endif
.start_port_reset = ohci_start_port_reset,
};