aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-02-04 23:57:48 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-24 21:16:34 -0700
commit1409e8e0e4dae15735727d7e2814b62aff609d31 (patch)
tree270133e6ac36d8c8bde069f6e7819998ce357145 /drivers/usb
parent5ddeac117f869c0da85e41e89dd5ed1199dab7dd (diff)
USB: usb-ohci-sm501-driver: use the conventional convention for suspend and resume
Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Magnus Damm <damm@igel.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ohci-sm501.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index 4ea92762fb2..8ffcd3e5f56 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -242,6 +242,9 @@ static int ohci_sm501_resume(struct platform_device *pdev)
usb_hcd_resume_root_hub(platform_get_drvdata(pdev));
return 0;
}
+#else
+#define ohci_sm501_suspend NULL
+#define ohci_sm501_resume NULL
#endif
/*-------------------------------------------------------------------------*/
@@ -253,10 +256,8 @@ static struct platform_driver ohci_hcd_sm501_driver = {
.probe = ohci_hcd_sm501_drv_probe,
.remove = ohci_hcd_sm501_drv_remove,
.shutdown = usb_hcd_platform_shutdown,
-#ifdef CONFIG_PM
.suspend = ohci_sm501_suspend,
.resume = ohci_sm501_resume,
-#endif
.driver = {
.owner = THIS_MODULE,
.name = "sm501-usb",