From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 5 Feb 2008 07:57:48 +0000 (-0800)
Subject: USB: usb-ohci-sm501-driver: use the conventional convention for suspend and resume
X-Git-Tag: v2.6.26-rc1~1061^2~104
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1409e8e0e4dae15735727d7e2814b62aff609d31;p=linux-2.6-omap-h63xx.git

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>
---

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",