From 4e457b63894adb4aa2dc812eb05303fa4d097691 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Mon, 2 Oct 2006 07:20:10 -0700
Subject: [PATCH] --- yaml --- r: 39803 b: refs/heads/master c:
 8442ae00d47dad690ac1105b426274433dc672f8 h: refs/heads/master i:   39801:
 21c6a73109ea3a372462152494278b3467ce5979   39799:
 fccc28d54693ab7486b5fb0441236752bf7fad84 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/host/ohci-pnx4008.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6a955e12ba6c..f25da4e14374 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a2ea1dfc4ee078841cd6406ebf6bf0c5a3d25e9
+refs/heads/master: 8442ae00d47dad690ac1105b426274433dc672f8
diff --git a/trunk/drivers/usb/host/ohci-pnx4008.c b/trunk/drivers/usb/host/ohci-pnx4008.c
index 82cb22f002e7..2dbb77414905 100644
--- a/trunk/drivers/usb/host/ohci-pnx4008.c
+++ b/trunk/drivers/usb/host/ohci-pnx4008.c
@@ -262,6 +262,7 @@ static const struct hc_driver ohci_pnx4008_hc_driver = {
 	 */
 	.start = ohci_pnx4008_start,
 	.stop = ohci_stop,
+	.shutdown = ohci_shutdown,
 
 	/*
 	 * managing i/o requests and associated device resources
@@ -280,7 +281,11 @@ static const struct hc_driver ohci_pnx4008_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,
 };
 
@@ -410,8 +415,6 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
 		goto out4;
 	}
 
-	hcd->self.hcpriv = (void *)hcd;
-
 	pnx4008_start_hc();
 	platform_set_drvdata(pdev, hcd);
 	ohci = hcd_to_ohci(hcd);